- template changes to make new css consistent
Merge branch 'master' of https://github.com/XenoPhage/cs320