Correct code, output needs formatting and code needs commenting
Merge branch 'master' of https://github.com/ajpauwels/cs2223_1