fix
as
fix
Merge remote-tracking branch 'origin/master' into Vulkanmannen
fix
asd
pushback
bakgrund
pushback
walljump 2.0
animationer mm
små fix ljud o ani
fix
Merge remote-tracking branch 'origin/Vulkanmannen'

Conflicts:
	The Seekers Way 0.2/Main.cpp
	The Seekers Way 0.2/The Seekers Way.exe
	The Seekers Way 0.2/The Seekers Way.vcxproj.filters
	The Seekers Way 0.2/Tottemaptest.png
fix
Merge branch 'master' of https://github.com/Vulkanmannen/TheSeekersWayProject

Conflicts:
	The Seekers Way 0.2/EntityManager.cpp
	The Seekers Way 0.2/EntityManager.h
	The Seekers Way 0.2/The Seekers Way.vcxproj
	The Seekers Way 0.2/The Seekers Way.vcxproj.filters
Merge remote-tracking branch 'origin/Peter'

Conflicts:
	The Seekers Way 0.2/The Seekers Way.vcxproj.filters