Gjort klart tutorial
Merge branch 'master' of https://github.com/Jakob37/JDGAME

Conflicts:
	JD spel - 140415/JD spel.suo
	JD spel - 140415/JD spel/JD spel/bin/x86/Debug/Content/HappySong.wma
	JD spel - 140415/JD spel/JD spel/bin/x86/Debug/JD spel.exe
	JD spel - 140415/JD spel/JD spel/bin/x86/Debug/JD spel.pdb
	JD spel - 140415/JD spel/JD spel/obj/x86/Debug/JD spel.exe
	JD spel - 140415/JD spel/JD spel/obj/x86/Debug/JD spel.pdb
	JD spel - 140415/JD spel/JD
spelContent/obj/x86/Debug/ContentPipeline.xml