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

Conflicts:
	test.txt
updated conflict on test.txt
Merge branch 'master' of https://github.com/ithands/training

Conflicts:
	test.txt