lenovo commit before merge
weirdo merge conflict with meld
Merge branch 'master' of https://github.com/Zulban/mcgill-website
renamed model varnames for clarity
rewriting text
tweaks
Merge branch 'master' of https://github.com/Zulban/mcgill-website