Stole Temper
Normal stuff
Merge branch 'gh-pages' of https://github.com/brandonnchoii/hackDuke into gh-pages

Conflicts:
	contactus
Merge branch 'gh-pages' of https://github.com/brandonnchoii/hackDuke into gh-pages