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

Conflicts:
	bin/classes/com/example/womenshealth_cis350/R$drawable.class
	bin/classes/com/example/womenshealth_cis350/R$id.class
	bin/classes/com/example/womenshealth_cis350/R$layout.class
	bin/classes/com/example/womenshealth_cis350/R$menu.class
	bin/classes/com/example/womenshealth_cis350/R$string.class
	bin/classes/com/example/womenshealth_cis350/R$style.class
	bin/classes/com/example/womenshealth_cis350/WhatToExpect.class
	gen/com/example/womenshealth_cis350/R.java
Merge branch 'master' of https://github.com/stefaniea/WomensHealth_CIS350

Conflicts:
	bin/classes/com/example/womenshealth_cis350/R$drawable.class
	bin/classes/com/example/womenshealth_cis350/R$id.class
	bin/classes/com/example/womenshealth_cis350/R$layout.class
	bin/classes/com/example/womenshealth_cis350/R$menu.class
	bin/classes/com/example/womenshealth_cis350/R$string.class
	bin/classes/com/example/womenshealth_cis350/R$style.class
	bin/classes/com/example/womenshealth_cis350/WhatToExpect.class
	gen/com/example/womenshealth_cis350/R.java
No idea what this is doing to be completely  honest