continued work
Merge branch 'master' of https://github.com/ericouyang/cs50-final-project-android

Conflicts:
	Recipes/src/net/cs50/recipes/BaseActivity.java