line for rebase

Conflicts:
	README
ww

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

Conflicts:
	Rakefile