Ебусь с заливкой
Merge branch 'master' of https://github.com/abashkirtsev/bash.im

Conflicts:
	README.md
teat 2