Updating Master Branch

Git has done some wierd stuff, and I've had to re-do a good bit of work.
I'm updating master, then restarting the working branch.

Features redone:
-Enemy parent instead of list
-Extracting object within area detection to global function
-SceneController script moved to camera for easier access, and
references updated
-Added global variables on Scene controller, removed magic numbers