Updated
Merge branch 'master' of https://github.com/chriswloftus/remote-repo

Conflicts:
	MyFileWriter.txt