Josh's changes
Merge branch 'master' of https://github.com/mhelmore/SogetiGitTraining

Conflicts:
	README.md