BernhardKonrad/SetGame — pull request #28 by JeromeLefebvre (2014-04-12 15:39:46+00:00)
Title: Added visual elements to the game, plus fixed a bug with how the cards were handled

Sorry about the main.py file. I need to learn more about git.
I'm guessing it is possible to do the following:
commit changeA
commit changeB
somehow drop changeA since it doesn't conflict with changeB
push #which only pushes changeB