Cleanup, spartanization and javadoc
Merge
Merge branch 'master' of https://github.com/Booterman/Team9-4BIP