Queuing up moves
Merge branch 'master' into feature

Conflicts:
	gameObject.js
	index.html
	main.js