camera
Merge branch 'camera'

Conflicts:
	moai/main.lua
camera fixes
Merge branch 'master' of github.com:wahjah/molyjam2

Conflicts:
	moai/main.lua