dingen
Merge branch 'master' of https://github.com/FrostEngine/projectx.git
dingen
Merge branch 'master' of https://github.com/FrostEngine/projectx.git

Conflicts:
	src/main/java/projectx/inheritance/Garage.java