Commit 4
Merge remote-tracking branch 'choose_remote_name/master'

Conflicts:
	DemoGit/src/com/diegolusquinos/demogit/client/DemoGit.java