Pulling Kevin's magic
Merge branch 'master' of https://github.com/kevincvlam/hackbikeshareTO

Conflicts:
	directions.pyc