Ignore these changes
Delete log files
Log fix
Map trial
remove conflict in  application helper
Fix Dinesh syntax error merge conflict
Application helper methods need some tweaking
dinesh trying to make the map work
Resolve conflict in gemfile.lock
WIP
WIP
Remove merge conflicts
Merge branch 'master' of https://github.com/cicadas-2014/CitiRide
Merge branch 'master' into Preprocess_Bike_Data
fix merge conflicts
Merge pull request #27 from raghav1987/fix_merge

Fix merge