hello, world
Merge branch 'master' of github.com:xoposhiy/trash

Conflicts:
	README.md