camera zoom and new assets
Merge branch 'master' of https://github.com/c-reed/PRCO303