Social Page
Merge branch 'master' of https://github.com/lukepeeler/codeforgood-team11

Conflicts:
	Get Well Android App/res/layout/social_screen.xml
	Get Well Android App/src/com/goodwill/getwell/HealthScreen.java
social page
Merge branch 'master' of https://github.com/lukepeeler/codeforgood-team11