Merge branch 'master' of https://github.com/cristopherson/BomberJade

Conflicts:
	src/BomberPlayerAgent.java