loredana branch: second commit
Merge remote-tracking branch 'remotes/origin/master' into loredanaBranch

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

Conflicts:
	lib/simplegit.rb