Commit to allow for merging
Merge branch 'master' of https://github.com/bickleydb/PuzzlesProject

Conflicts:
	Akari_Board.java
Started more refactoring