Merge from the original repo, resolve merge conflict

HvZWAT / claremontHvZ

Code for the claremont HvZ website.

claremonthvz.org

MIT License

0 stars 6 forks source link

Merge from the original repo, resolve merge conflict #20

Open hmc-cs-ctan opened 6 years ago

hmc-cs-ctan commented 6 years ago

The main repo has been changed a lot since we pulled from their original code. "a lot of the changes are just files getting moved to different locations" (Olivia)