Merge branch 'master' into Oscars-Branch
Modified readme

Added notes on what the branches are for and a suggestion for how to
work in unity.
Merge branch 'Oscars-Branch'
Merge branch 'master' into Nicks-Branch