another line to conflict
Merge branch 'master' of https://github.com/bulatov/test

Conflicts:
	lib/simplegit.rb