Sound effects
Merge branch 'master' of https://github.com/buddingmonkey/monocular

Conflicts: