Hard Code XML to Java
delete r.java
Merge branch 'master' of https://github.com/lukepeeler/codeforgood-team11

Conflicts:
	Get Well Android App/src/com/goodwill/getwell/CurrentGoalScreen.java