Added events for join and gameStart
Merge branch 'master' into gameStart
Little fix for modify
Merge branch 'master' into gameStart
Added width and height calculation
Merge branch 'master' into gameStart

Conflicts:
	app.js
Fixed all undefined errors for underscore, added a test and simplified the gamebuilder and created a test