hello
Merge branch 'master' of https://github.com/mike0631/healthyDroid

Conflicts:
	healthyDroid/res/layout/activity_main.xml