s
Merge branch 'git-workshop' of
https://github.com/blstream/patronage-2013-szczecin-sandbox.git into
workspace

Conflicts:
	a.txt