fefg
Merge branch 'master' of https://github.com/dan-42/gitHowTo.git

Conflicts:
	GitHowTo/src/HelloGit.java