Reset
Merge branch 'master' of https://github.com/Challio5/ProjectGarage

Conflicts:
	src/nl/eti1b5/garage/Test.java