committing to pull
Merge branch 'master' of https://github.com/stefaniea/WomensHealth_CIS350

Conflicts:
	bin/WomensHealth_CIS350.apk
	bin/classes.dex