This is the commit message.
Merge branch 'master' of https://github.com/martin-sicho/SBSJ

Conflicts:
	README.md