Design
Merge branch 'master' of https://github.com/pumpeddevs/hackathon.submit

Conflicts:
	application/views/game/index.php
	application/views/layout/front.php