Style fixes n stuff
Merge branch 'Stage4' of https://github.com/acdana/ComS309Project into Stage4