ate a sandwich and modified goodbyWorld.java
added comment to helloWorld.java
b2 commit
Merge branch 'master' of https://github.com/dgoetsch/hello-world
cleaned up helloWorld.java
commiting branch1 changes
commiting branch2 changes
resolving conflicts from branch1 and branch2