merge and improved movement
Merge branch 'master' of https://github.com/jonbuckley33/ProjectRed

Conflicts:
	scripts/Keyboard.js