blargh
Merge branch 'master' of https://github.com/carter213/cse190

Conflicts:
	Grubber/gen/com/example/grubber/R.java
results page
Merge branch 'master' of https://github.com/carter213/cse190
string stuff
Merge branch 'master' of https://github.com/carter213/cse190

Conflicts:
	Grubber/gen/com/example/grubber/R.java
	Grubber/res/layout/activity_signup.xml
	Grubber/src/com/example/grubber/signupActivity.java
clean up
Merge branch 'master' of https://github.com/carter213/cse190