John's rebase commit
Merge branch 'master' of git@github.com:arcticmatt/MyFirstAppGit.git

Conflicts:
	MyFirstAppGit/test.txt