in progress event for starting game
Merge branch 'master' into cassidy_premila

Conflicts:
	js/controller.js
Merge pull request #11 from Cheerazar/cassidy_premila

in progress event for starting game