asdas
Merge branch 'master' of https://github.com/Omnes/Spelprojekt

Conflicts:
	Spelprojekt/Game.cpp
gfui
Merge branch 'Jessica'
yufguov