game layout
Merge branch 'master' of https://github.com/vanblaze/honeypot

Conflicts:
	bootstrap/css/startStyle.css
game layout