4/9 gameController into two files
4/8Merge branch 'adrians_branch'

Conflicts:
	public/index.html
	public/js/angular_app.js
	public/js/angular_controllers/.DS_Store