refactored, fixed bug on checking for wins, winning combos changed to a constant
Resolved conflict with origin/master