Committing
Merge branch 'master' of https://github.com/ajpauwels/cs2223_1.git

Conflicts:
	CS2223_1/src/Market.java