activity javadoc checkstyle
Merge branch 'master' of https://github.com/xinyichen/CS-2340-Project