Added additional screens and transitions

Added new screens for Meredith and Giuliani to edit
missed file
Merge branch 'master' of https://github.com/henry-west/ThreeScreens

Conflicts:
	AndroidManifest.xml
	bin/AndroidManifest.xml
	bin/ThreeScreens.apk
	bin/classes.dex
	bin/resources.ap_
	gen/edu/drake/threescreens/R.java
	res/layout/activity_main.xml
	res/values/strings.xml