Added new-file.txt
Amended new-file.txt
Merge branch 'master' of https://github.com/brookter/git-tutorial

* 'master' of https://github.com/brookter/git-tutorial:
  Added new-file.txt:wq

Conflicts:
	new-file.txt