Merge pull request #185 from eonarheim/dev-josh

camera shake #55
Merge remote-tracking branch 'origin/master' into dev-josh