Use relative paths so that it works well on gh-pages
Zoom out
Add font-awesome to bower.json
Add livereload
Coding standards
Get distances
Merge remote-tracking branch 'upstream/master'

Conflicts:
	app/js/map.js