second commit
Merge remote-tracking branch 'origin/loredanaBranch'

Conflicts:
	lib/simplegit.rb
third commit
Merge remote-tracking branch 'origin/loredanaBranch' into iulian_branch

Conflicts:
	lib/simplegit.rb
Merge remote-tracking branch 'remotes/origin/master' into loredanaBranch
loredana branch: 1 commit for patch