reverted code back to pass new tests. removed api test as is unnecessary right now if at all. hadn't realized changes were committed =X sry
Merge branch 'master' of https://github.com/KevinTCoughlin/citibike

Conflicts:
	package.json