Merge branch 'master' of https://github.com/Freeport-Metrics/bikeday

Conflicts:
	js/main.js
Merge branch 'master' of https://github.com/Freeport-Metrics/bikeday

Conflicts:
	js/map.js
Merge branch 'master' of https://github.com/Freeport-Metrics/bikeday
Merge branch 'master' of https://github.com/Freeport-Metrics/bikeday

Conflicts:
	js/map.js
Merge branch 'master' of https://github.com/Freeport-Metrics/bikeday
Merge branch 'master' of https://github.com/Freeport-Metrics/bikeday

Conflicts:
	js/map.js