asdasdasd
Merge branch 'Jessica'

Conflicts:
	Spelprojekt/EventManager.cpp
	Spelprojekt/Game.cpp
asdasd
Merge branch 'robin'