konflikt
deleted map2
Merge remote-tracking branch 'origin/Ameroz'

Conflicts:
	The Seekers Way 0.2/Main.cpp