commit header changes
Merge branch 'master' of https://github.com/axsauze/HackaGlobal

Conflicts:
	website/static/css/index.css