laptop commit
Merge branch 'master' of https://github.com/valgriz/JavaFXcollab

Conflicts:
	bin/JumpGame$3.class
	bin/JumpGame$4.class
	bin/JumpGame.class
	src/JumpGame.java