Fixed right wall

Also reduced usage of magic numbers for wall collision handling
Redid gravity
Merge remote-tracking branch 'origin/master'

Conflicts:
	js/player.js