matt test 2
Merge branch 'master' of
ssh://git@github.com/arcticmatt/MyFirstAppGit.git

Conflicts:
	MyFirstAppGit/test.txt