fixed merge conflict
Merge branch 'master' of github.com:tstullich/mancala
Merge branch 'master' of github.com:tstullich/mancala
Merge branch 'master' of github.com:tstullich/mancala
closed stuff yeayh
Merge branch 'master' of github.com:tstullich/mancala
Merge branch 'master' of github.com:tstullich/mancala
Merge branch 'master' of github.com:tstullich/mancala
Merge branch 'master' of github.com:tstullich/mancala
Merge branch 'master' of github.com:tstullich/mancala
Merge branch 'master' of github.com:tstullich/mancala
Committing fix for my own bugs through patrick's account