featureA : small new line
Merge branch 'featureA' of https://github.com/lgiulian/test into featureA

Conflicts:
	lib/simplegit.rb