--
Merge branch 'master' of https://github.com/BitBangaz/Projekt-A

Conflicts:
	bin/main/Game.class