asdfsdf
Merge branch 'master' of https://github.com/mtjoe/AI-Project-B

Conflicts:
	FenceMasterB/bin/aiproj/fencemasterImpl/Egama.class
	FenceMasterB/src/aiproj/fencemasterImpl/Egama.java
asdfadsf