third committ
Merge branch 'master' of https://github.com/bwalker99/Sandbox.git

Conflicts:
	GitHelloWorld2/src/HelloWorld2.java