trying to resolve egit error
Merge branch 'master' of https://github.com/araymer/SomeTowerDefense.git

Conflicts:
	bin/Model/Tile.class