Committed version.
Merge branch 'master' of https://github.com/brianhp/LearningGIT.git

Conflicts:
	src/LearningGIT.java