Buggfix sista banan
Merge branch 'master' into Robbin
Rensat i github-mappen
Merge branch 'master' into Robbin

Conflicts:
	Design/gm-versioner/28e mars/nya_banor (28e mars).exe
	Programmering/Spelbara versioner/demo-banorna.exe
	Programmering/Spelbara versioner/gamemaker-versioner/_save175031892.sav
	Programmering/Spelbara versioner/gamemaker-versioner/v11.5(nya lvls).exe
	Programmering/Spelbara versioner/gamemaker-versioner/v11.5_kontrollschema.txt
	Spelbara versioner/demo-banorna.exe
	Spelbara versioner/gamemaker-versioner/demo-banorna.exe
	Spelbara versioner/gamemaker-versioner/v11.5(nya lvls).exe
Merge branch 'master' into Robbin
Merge branch 'Robbin' of https://github.com/Dahlqvist/Spelprojekt1 into Robbin

Conflicts:
	Programmering/Level editor/Level Editor Released/Texture/Enviroment/Tiles/Bolcony_Corner_L_32_dark_02.png - Shortcut.lnk
	Programmering/Spelbara versioner/Older/Playable Version 12Mars/Texture/Enviroment/Tiles/Bolcony_Corner_L_32_dark_02.png - Shortcut.lnk
	Programmering/Spelbara versioner/Older/Playable Version 15Mars/Texture/Enviroment/Tiles/Bolcony_Corner_L_32_dark_02.png - Shortcut.lnk
	Programmering/Spelbara versioner/Playable Version 19Mars/Texture/Enviroment/Tiles/Bolcony_Corner_L_32_dark_02.png - Shortcut.lnk