m
Merge branch 'master' of https://github.com/AdrianAmpt/Midget

Conflicts:
	bin/com/midget/domain/Domain.class
	bin/com/midget/game/GameFactory.class
	bin/com/midget/player/PlayerFactory.class
	bin/com/midget/track/Cell.class
	bin/com/midget/track/HomePlate.class
	bin/com/midget/track/Track.class
	bin/com/midget/track/TrackFactory.class
	bin/com/midget/track/obstacle/Hole.class
	bin/com/midget/track/obstacle/Obstacle.class