Some camera changes
Merge branch 'master' of https://github.com/xanderflood/StickTangle