I messed some stuff up
Merge branch 'master' of https://github.com/kgoodwill/bikeshare

Conflicts:
	index.html