first bootstrap stuff
included bootstrap
started on a template
readded login form
Merge branch 'master' into bootstrap

Conflicts:
	public/game.php
	public/index.php
	public/login.php
	public/startgame.php
Merge branch 'master' into bootstrap
Merge branch 'bootstrap'
fixed missing bracket