Changed the order of some of the methods so they're a little more
readable.
Modified map slightly.
Merge branch 'master' of
https://github.com/CameronProbert/SWEN222Project.git