Dec 11 Backup
Merge branch 'master' of https://github.com/RhettAmin/HC3-Milestone3
Revert to a0cc0ea3cbb003ecb919cca8fa9e2bfc4688d6c0
Merge branch 'master' of https://github.com/RhettAmin/HC3-Milestone3

Conflicts:
	Template/index.html
	Template/main.css
Conflicts Fixes