camera update
Merge branch 'master' of https://github.com/willistherage/kimjongawesome