start
zmiana
Merge remote-tracking branch 'upstream/master'

Conflicts:
	README.md
Merge pull request #104 from rgroszek/master

start