More classes yayy!!
Merge branch 'master' of https://github.com/ajpauwels/cs2223_1
More classes!