Pan and rotate work
Merge branch 'master' of github.com:Vici37/csci544

Conflicts:
	game.js
Everything works