did I do anything?
Merge branch 'master' of github.com:anniebae/wdi_the_nomads
typo fix models/trail line 150
gemfile and scheme
merge conflict resolved
migration to change lat/lon datatypes to float
populate_trailsolutions raketask turns lat/lon into floats
sweeptrails bug :lat<4 incompatibility fixed
setgeocoordinates method error fixed by initially defining locationstring as empty string
add sweeptrails and setgeocoordinates methods into populate_trails raketask
merge conlict resolved
Merge branch 'sweeptrails_method_error'