Did stuff
Merge branch 'master' of https://github.com/Duskbloom/prog2_task2

Conflicts:
	src/MapPanel.java