Red
Allen Commit Red
Allen commit blue
Merge branch 'blue'

Conflicts:
	MyFirstApp2/src/com/example/myfirstapp2/DisplayMessageActivity.java