Changing to decorators and private variables.
Merge branch 'master' of https://github.com/BernhardKonrad/SetGame
Merge remote-tracking branch 'bernhard/master'

Conflicts:
	Set.py
Merge branch 'master' of https://github.com/BernhardKonrad/SetGame
Merge pull request #23 from JeromeLefebvre/master

A possible way to fix the issues with the buttons
Merge pull request #24 from JeromeLefebvre/master

Getting the super basics of a game going
Merge pull request #25 from JeromeLefebvre/master

Minor clean up and replace bold and italics with other markers
Merge pull request #26 from JeromeLefebvre/master

Just the basic changes required to get a 1 player game going.
Merge pull request #28 from JeromeLefebvre/master

Added visual elements to the game, plus fixed a bug with how the cards were handled
Merge pull request #30 from JeromeLefebvre/master

added comment to the Deck file and split off the unittesting code
Merge pull request #32 from JeromeLefebvre/styling

Tried to do some basic styling, but this is hard to do in kivy. This atl...
add a dropdown set buttom for multiplayers
Merge branch 'master' of https://github.com/jiag/SetGame into jiag-master

Conflicts:
	screen.kv
changed the postion of those labels
Merge pull request #34 from jiag/master

changed the postion of those labels
Merge pull request #36 from JeromeLefebvre/improveDeckCoverage

Improving the coverage of Deck as an excuse to try out git stuff
added a simple timer that shows a hint after 10 seconds'
Fixes the lack of hint showing up on the second page
Merge branch 'hint' of https://github.com/JeromeLefebvre/SetGame into JeromeLefebvre-hint

Conflicts:
	screen.kv
	screen.py
Update scree