Fixed merge conflicts
Merge branch 'master' of https://github.com/Thepriestdude/java-starter-kit

Conflicts:
	src/main/java/com/monkeymusicchallenge/bee/AI.java