i dont know what i'm doing

i dont understand git
all of the logic for the game

still need to add free turn and capture.
Merge branch 'master' of https://github.com/bigredwill/Mancala

Conflicts:
	Mancala/src/Mancala.java
	Mancala/src/Model.java
5:05 pm

wtf