Merge branch 'nathan-dev' into richmond-dev
merging in nathan's latest styling changes
Merge branch 'nathan-dev' into richmond-dev
merging with Nathan's branch t
Merge branch 'nathan-dev' into richmond-dev
potential fix for marker sizing issue
markers are now scaling appropriately..still need some work on desktop
cleaned up custom markers function
Merge branch 'richmond-dev' into aaron-dev

Conflicts:
	app/static/js/es6/compiled/locations.js
	app/static/js/es6/locations.es6.js