created new files for testing inter app communication to get google map directions
Added a story board I am going to use to test the inter app connection
xcode project tracking updates
upstream merge changes
Added a hard copy of our json feed to do testing
Calling the class method findClosestStation for testing and for the views to use
automatic project updating. Ignore
IGNORE. Some git tracking stuff
NSLogged some info and madr notes for handling errors
This is the new class method to find the nearest station
we created a new test to make sure our new class method is working and able to find the closest stations
git automatic updating of log files
merged changes
merging the upstream master with my branch
project file updates. IGNORE
IGNORE. more tracking changes
Merge branch 'master' of https://github.com/red-spotted-newts-2014/bike-path into vivek

Conflicts:
	bikepath.xcodeproj/project.pbxproj
IGNORE. Computer automatic changes
pull changes
merging changes