Merge branch 'Farkle' of https://github.com/BinEP/Games into Farkle
Merg Conflicts resolved
Merge branch 'Farkle' of https://github.com/BinEP/Games into Farkle