branch 1, greenView image changed
Merge commit 'adf19e38ee726dc9fac4600d94546b2dfd4f35ad'

Conflicts:
	TXercise.xcodeproj/project.pbxproj