it's fine
Merge branch 'master' of https://github.com/Jac21/HackerBowl2014

Conflicts:
	index.html