Tab project
Merge remote-tracking branch 'master/tabs' into mostUpdated120pm
Extra feature added.
1230Commit
ignore
Commit100AM
Sunday841AmCOmmit
Commit before practice presentation
Merge remote-tracking branch 'master/finalbeforepresentation' into
Sunday846

Conflicts:
	SunsetCenter/AndroidManifest.xml
	SunsetCenter/bin/AndroidManifest.xml
	SunsetCenter/bin/classes.dex
	SunsetCenter/res/values/strings.xml
	SunsetCenter/src/com/example/sunsetcenter/MainScreen.java
	SunsetCenter/src/com/example/sunsetcenter/PrescriptionActivity.java