prep to pull
Merge branch 'master' of github.com:JoeJohnRobert/GitPaired
Merge branch 'master' of github.com:JoeJohnRobert/GitPaired
 prep to pull
merge fixes
merge conflict fixes
java fix