base.html changes
Merge branch 'frontend' of https://github.com/rjw245/tuftshackS2014 into frontend