initial project version
Initial commit
Merge branch 'master' of https://github.com/bikeshare/web-bootstrap
Update README.md
Merge branch 'master' of https://github.com/bikeshare/bikeshare-webConflicts:	LICENSE	README.md	requirements.txt## It looks like you may be committing a merge.# If this is not correct, please remove the file#	.git/MERGE_HEAD# and try again.# Please enter the commit message for your changes. Lines starting# with '#' will be ignored, and an empty message aborts the commit.# On branch master# All conflicts fixed but you are still merging.## Changes to be committed:#	modified:   LICENSE#	modified:   README.md#	new file:   app.py#	modified:   requirements.txt## Untracked files:#	LICENSE.orig#	README.md.orig#	requirements.txt.orig#