tip
Merge branch 'master' of github.com:96chan/bikeshare

Conflicts:
	_js/script.js