file way
Merge branch 'master' of github.com:HotPizzaBox/TowerDefense

Conflicts:
	resources/maps/Highlands/map.png
	src/Game.cpp