fix
Merge branch 'master' into Robbin
Trigger+dialogboxar
Merge branch 'master' of https://github.com/Dahlqvist/Spelprojekt1