new branch for android development. Commented out places needed for stoarge
Added GPS Locator File
Added assigned project spec
Implemented distance calculator
Fixed merge conflicts
Merge branch 'master' of github.com:cs27x/team6
Merge pull request #5 from cs27x/feat/clark_perkins

Storage implementation
Get UI and storage working together
Changed floats to double
Merge pull request #6 from cs27x/feat/jeremey_key

Added GPS Locator File
Added GPS location sorting
Created a new test to test JSON loading.  Needs to be a part of MainActivityTest, not RestaurantListTest
Added all the tests for RestaurantListTest.java
Added .equals() method to Restaurant
Added .travis.yml