asdasdasd
git asdMerge branch 'sean'

Conflicts:
	Spelprojekt/Entity.h
asd
Merge branch 'master' of https://github.com/Omnes/Spelprojekt
Merge branch 'sean'