loredana branch: third commit
third commit
Merge remote-tracking branch 'origin/loredanaBranch' into iulian_branch

Conflicts:
	lib/simplegit.rb