derping
Merge branch 'master' of https://github.com/ysugiant/grubber

Conflicts:
	Grubber/src/com/example/grubber/NewFoodActivity.java
Merge branch 'master' of https://github.com/ysugiant/grubber
Merge branch 'master' of https://github.com/ysugiant/grubber
working on stuff before pulling
Merge branch 'master' of https://github.com/ysugiant/grubber

Conflicts:
	Grubber/AndroidManifest.xml
Merge branch 'master' of https://github.com/ysugiant/grubber
Updated Login and register pages