e
Merge branch 'master' of https://github.com/hamsterofdark/HelloGit

Conflicts:
	GitDemo/src/com/michaellandryweb/HelloGit.java