collision and viewport changes
Merge branch 'master' of https://github.com/throbbingrobotheroes/amazonmushroom