another commit
Merge branch 'master' of https://github.com/borisjoffe/git-workshop

Conflicts:
	README.md
Merge branch 'master' of https://github.com/borisjoffe/git-workshop