More commenting and method additions
Merge branch 'master' of https://github.com/DECO3800TeamOrange/Working