stuff
lagaði smá í bili
Merge remote-tracking branch 'origin/master'

Conflicts:
	js/Character.js
	js/IcyTower.js