5455445
Merge branch 'Jessica'

Conflicts:
	Spelprojekt/ActiveLayer.cpp
klase