working on collision logic
Merge branch 'master' of https://github.com/halldorok11/Dorol

Conflicts:
	bin/MainGame.class
	src/MainGame.java
gawegew
Merge branch 'master' of https://github.com/halldorok11/Dorol

Conflicts:
	bin/MainGame.class
Merge branch 'master' of https://github.com/halldorok11/Dorol
Map toggle working properly
Map Toggle
Merge branch 'master' of https://github.com/halldorok11/Dorol

Conflicts:
	bin/MainGame.class