Dealing with this
Merge branch 'master' of https://github.com/whytedev/future-gadget-lab

Conflicts:
	src/CompetitorAI.java