add a todo and a comment
add a todo
added a new comment
Merge branch 'experiment'

Conflicts:
	lib/simplegit.rb