Removing a file
Merge branch 'master' of https://github.com/Smith7018/CapstoneAndroidApp

Conflicts:
	WomensHeartHealth/bin/classes/com/example/womenshearthealth/TabListener.class