changing user input controls
Merge branch 'master' of github.com:bmceldowney/side-scroller
adding express server
Merge branch 'master' into jungle

Conflicts:
	objects/player.js