edited some
Merge branch 'master' of https://github.com/raywu22/ShireAWAP

Conflicts:
	java/src/awap/OurBoard.java