Added some minor changes

Read the readme to figure out what the changes are. Cool right?
Formatting
Merge https://github.com/FaithForHumans/SoftwareEngineeringProject into sprogel
Merge branch 'workingBranch' of https://github.com/FaithForHumans/SoftwareEngineeringProject into sprogel
Working on moving a few classes around, etc
Merge branch 'sprogel' of https://github.com/FaithForHumans/SoftwareEngineeringProject into sprogel
Working on moving a few classes around, etc