asdasdasd
Merge branch 'master' into robin

Conflicts:
	Spelprojekt/Takitikmeny.cpp
xasdasd
asd
Merge branch 'Jessica'