first commit for patch
second commit for patch
Merge remote-tracking branch 'origin/iulian_branch'

Conflicts:
	lib/simplegit.rb
Merge remote-tracking branch 'remotes/origin/master' into loredanaBranch

Conflicts:
	lib/simplegit.rb