Merge branch 'master' of github.com:lgeorgieff/git_training
Merge branch 'master' of github.com:lgeorgieff/git_training

Conflicts:
	README.md