m2 and m3
Merge branch 'master' of github.com:OBipolar/java-CS2340