asdasdasd
Merge branch 'master' of https://github.com/Omnes/Spelprojekt
5455445
Merge branch 'Jessica'

Conflicts:
	Spelprojekt/ActiveLayer.cpp