Animation ferdig
Merge branch 'master' of https://github.com/labanisten/TestGame1

Conflicts:
	Shooter/bin/x86/Debug/Shooter.exe
	Shooter/bin/x86/Debug/Shooter.pdb
	Shooter/obj/x86/Debug/Shooter.exe
	Shooter/obj/x86/Debug/Shooter.pdb

	modified:   Shooter/Shooter.csproj.Debug.cachefile
	modified:   Shooter/bin/x86/Debug/Content/Sound/gameMusic.wma
	modified:   Shooter/bin/x86/Debug/Content/Sound/menuMusic.wma
	modified:   Shooter/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	new file:   Shooter/obj/x86/Debug/ResolveAssemblyReference.cache
	modified:   Shooter/obj/x86/Debug/Shooter.csproj.FileListAbsolute.txt
	modified:   Shooter/obj/x86/Debug/cachefile-{301A0986-067D-486C-9FDE-689861944A3A}-targetpath.txt
	new file:   ShooterContent/lander.png
	new file:   ShooterContent/lander_animation.png
	modified:   ShooterContent/obj/x86/Debug/ContentPipeline.xml
	modified:   ShooterContent/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	new file:   ShooterContent/obj/x86/Debug/ResolveAssemblyReference.cache
	new file:   ShooterContent/obj/x86/Debug/ShooterContent.contentproj.FileListAbsolute.txt