Deleting temporary unity files
Lots of changes
Merge branch 'Oscars-Branch'
Merge branch 'master' into Nicks-Branch