added health screen
Merge branch 'master' of https://github.com/lukepeeler/codeforgood-team11

Conflicts:
	Get Well Android App/bin/classes/com/goodwill/getwell/R$layout.class
	Get Well Android App/bin/classes/com/goodwill/getwell/R$menu.class
	Get Well Android App/bin/classes/com/goodwill/getwell/R$string.class
	Get Well Android App/bin/classes/com/goodwill/getwell/R$style.class
	Get Well Android App/bin/classes/com/goodwill/getwell/WelcomeScreen.class
	Get Well Android App/gen/com/goodwill/getwell/R.java
something that works.