qwe123123

Conflicts:
	Rakefile
Merge branch 'master' of https://github.com/bulatov/test
vv
123123123
Merge branch 'master' of https://github.com/bulatov/test

Conflicts:
	README
new
123123
Merge branch 'master' of https://github.com/bulatov/test

Conflicts:
	README