Staticit eri paikkaan
Merge branch 'master' of github.com:woltage/codecamp14-whitetrash

Conflicts:
	views/map.jade