Fixing camera conflict
Merge branch 'master' of https://github.com/nolanfilter/MPHorror into Nolan
Merge pull request #16 from nolanfilter/Nolan

Nolan
Merge branch 'master' of github.com:nolanfilter/MPHorror into Bruce