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

Conflicts:
	Recipes/res/values/styles.xml
see last commit