wut
Merge branch 'master' of https://github.com/Elementrat/559p3
hey
Merge branch 'master' of https://github.com/Elementrat/559p3

Conflicts:
	js/camera.js