markers on map
Merge branch 'master' of https://github.com/woltage/codecamp14-whitetrash

Conflicts:
	styles/sass/views/_map.scss
	views/map.jade