Custom ikonit
Hyväksymis alue
Merge branch 'master' of github.com:woltage/codecamp14-whitetrash

Conflicts:
	static/js/map.js