Fninishdoor
darkbinidng
splash
plash
splash
Merge branch 'Ameroz' of https://github.com/Vulkanmannen/TheSeekersWayProject into Ameroz

Conflicts:
	The Seekers Way 0.2/IntroScreen.cpp
	The Seekers Way 0.2/Main.cpp
	The Seekers Way 0.2/The Seekers Way.vcxproj
Merge remote-tracking branch 'origin/master' into Ameroz

Conflicts:
	The Seekers Way 0.2/IntroScreen.h
	The Seekers Way 0.2/Kiba.cpp
	The Seekers Way 0.2/Main.cpp
	The Seekers Way 0.2/The Seekers Way.vcxproj
sdf
Merge branch 'Ameroz'

Conflicts:
	The Seekers Way 0.2/Main.cpp
asd
Merge branch 'master' into Ameroz

Conflicts:
	The Seekers Way 0.2/FinishDoor.cpp
	The Seekers Way 0.2/IntroScreen.cpp
	The Seekers Way 0.2/IntroScreen.h
	The Seekers Way 0.2/Maps/Level3.png
	The Seekers Way 0.2/State.cpp
	The Seekers Way 0.2/The Seekers Way.vcxproj
Signs one step futher
Merge branch 'master' of https://github.com/Vulkanmannen/TheSeekersWayProject

Conflicts:
	The Seekers Way 0.2/Maps/Level3.png
	The Seekers Way 0.2/Maps/level1.png
Level 3 fix

???
Merge branch 'master' of https://github.com/Vulkanmannen/TheSeekersWayProject
Merge remote-tracking branch 'origin/master' into peter

Conflicts:
	The Seekers Way 0.2/EntityManager.cpp