R fixed
Merge branch 'master' of https://github.com/Fates4Productions/MedCenter

Conflicts:
	gen/com/example/medcenter/R.java