Canon
Abc
Merge remote-tracking branch 'origin/Marcus'
Meny endringer

Meny
Merge branch 'stian'

Conflicts:
	core/gameloop.as