fixed nathan's merge conflict ;)
Merge branch 'master' of https://github.com/RITnextHop/site