Merge origin/master

Conflicts:
	src/garage/Garage.java