Todo update
Merge branch 'master' of https://github.com/OBipolar/java-CS2340