before merge
Merge branch 'master' of https://github.com/sukesake/JollyRoger
some camera stuff