with javadoc for group a
Merge branch 'master' of https://github.com/victorfei/project1_CS2110

Conflicts:
	1Bee/bin/Bee.class