Removed 2 more unused methods from interactions
Not sure what I modified here; probably just tidied up code
Made some minor changes
Added main.js as an include in camera and some tidying up/indentation in interactions and constants.js
Fixing merge conflicts in camera.html
Merge branch 'master' of https://github.com/DavidSaxon/M.A.F.I.A
You can now interact with any object by approaching it