Inter-Commit

Commit to update my changes. The changes are not entirely functional.
Merge branch 'master' of https://github.com/brentwalther/Fanorona