my changes
Merge branch 'master' of https://github.com/TorfinnBelbo/Best-Practice-team-work

Conflicts:
	HelloPutty.txt