1st commit on thing1 branch
deleted extraneous comments in Main.java on thing1 branch
Merge branch 'thing1'
on branch rebaseAttempt3, 1st commit
on master branch, trying to make rebaseAttemp3 merge back into master