testing a branch
Merge branch 'testbranch'

Conflicts:
	lib/simplegit.rb
better