Sort of fixed things.
Merge branch 'master' of https://github.com/MrZoraman/Katechon.git

Conflicts:
	Katechon/src/apcs/shoppingMaul/Board.java