hmm
Merge branch 'master' of https://github.com/filip-jovanovic/chase_game

Conflicts:
	src/edu/elfak/chasegame/MapActivity.java