Div hiding based on phases
Design restructuring
Merge remote-tracking branch 'origin/master'

Conflicts:
	gameFrame.html
	js/application.js
Div hiding based on phases
Design restructuring - continued push