nick at local new
Merge branch 'master' of https://github.com/ithands/training

Conflicts:
	test.txt
nick updated