game height/width fix
Merge remote-tracking branch 'origin/master'

Conflicts:
	js/phone.js
game height/width fix