added textviews to restaurant_details for more details. only thing left to do is add days with times to the listview in restaurant_details
Merge pull request #7 from cs27x/androidDev2

added textviews to restaurant_details for more details. only thing left ...
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
update listview
Merge pull request #9 from cs27x/feat/xiaochen_yang

update listview
Added .travis.yml
Fixed travis.yml
removed build from travis.yml
removed jacoco plugin, doesn't work with current version of android
Start emulator before running tests
Add debug option to travis to see what's wrong
Merge pull request #11 from cs27x/feat/clark_perkins

Added restaurant tests
Merge branch 'master' of https://github.com/cs27x/team6 into feat/alexander_wan

Conflicts:
	asgn1/assigned_project/code/GroupSixAsmtOne/app/app.iml
	asgn1/assigned_project/code/GroupSixAsmtOne/gradle/wrapper/gradle-wrapper.properties