brancheno1

a
Merge remote-tracking branch 'origin/Bartek2014-12-02-00'

Conflicts:
	pierwszy.txt