No Haiku

Fa sho
Merge branch 'master' of https://github.com/bigredwill/Mancala

Conflicts:
	Mancala/src/GameFrame.java
	Mancala/src/Model.java