Changed this retarded formatting
Merge branch 'master' of https://github.com/YenHuang/HackGT

Conflicts:
	content.html