change
matt lim committing myfirstapp git completed
matt lim committing myfirstapp git with missing files
Merge branch 'mattL'

Conflicts:
	MyFirstAppGit/AndroidManifest.xml
	MyFirstAppGit/MyFirstAppGit.iml
	MyFirstAppGit/res/layout/activity_main.xml
	MyFirstAppGit/res/values/strings.xml
	MyFirstAppGit/src/com/example/myfirstappgit/DisplayMessageActivity.java
	MyFirstAppGit/src/com/example/myfirstappgit/MainActivity.java