11
Merge branch 'master' of github.com:graylynx/test

Conflicts:
	README.md
12
13
20
Merge branch 'b1' of github.com:graylynx/test into b1