MERGE AND ALOHAS YOOO

Changed game.html

Modified

Merge conflict omg

init

adding in basic files

changed chat.html

css change
Merge branch 'master' of https://github.com/mvthen/HackCooper

Conflicts:
	css/bootstrap.min.css