Developer: Michael Serrato.
Merge branch 'master' of https://github.com/mikebsg01/COJ-Solutions