Kallinn dettur núna af palli
Merge branch 'master' of https://github.com/karlasgeir/icy_tower

Conflicts:
	js/Floors.js