added conditions
synced up with neil's stuff, made some fixes to the collision detecting, added call to server on/fail and added variable for user function waiting
Merge branch 'master' into hester6

Conflicts:
	.idea/workspace.xml
	Game/player.js
	index.html
	public/sandbox/Game/game.js
	public/sandbox/Game/gameObject.js
Adds doneMoving capabilities and win conditions.
Merge pull request #11 from djragsdale/hester6

Hester6