asdf
Merge branch 'master' of github.com:Dirbaio/Gita2

Conflicts:
	SceneMain/Map.cpp