uppd gm
Merge branch 'master' of https://github.com/Dahlqvist/Spelprojekt1
Error with stupid merges fixed

added stuff in the leveleditor
gm_boss1
Merge branch 'master' into Robbin