Squashed commit of the following:

commit 161e3fb66daeaf347e969994413ebd05ecd5df5b
Author: Tonko Mulder <tonko@tonkomulder.nl>
Date:   Tue Dec 2 19:54:47 2014 +0000

    replaced joker with scorekeeper in files

commit ba3e9cb3dd8a0c784982a67bcac8bc382cf9f377
Author: Tonko Mulder <tonko@tonkomulder.nl>
Date:   Tue Dec 2 19:48:57 2014 +0000

    renamed joker to scorekeeper
added migration for rewritten models

Player gets the score as a foreign key
Player has a custom save method, which updates the player score
Squashed commit of the following:

commit c403e730aa24a8fe4576ffee82fd465c098c9859
Author: Tonko Mulder <tonko@tonkomulder.nl>
Date:   Tue Dec 2 20:24:29 2014 +0000

    added migration for rewritten models

    Player gets the score as a foreign key
    Player has a custom save method, which updates the player score
added the Game model
Squashed commit of the following:

commit 70bfacf0379bd2d7595f1f57daa62f6906feb3d2
Author: Tonko Mulder <tonko@tonkomulder.nl>
Date:   Tue Dec 2 20:49:20 2014 +0000

    added the Game model
reorderd Player and Score model
modified score field, added FK to player
added a custom admin form for Player
moved save to player
modified tests to handle the new save method
Merge branch 'add-game-model'

Conflicts:
	scorekeeper/admin.py
	scorekeeper/models.py
	scorekeeper/tests.py
Merge branch 'rewrite-scorekeeper-models'

Conflicts:
	scorekeeper/models.py
	scorekeeper/tests.py
removed duplicate Score model
Merge branch 'master' of github.com:Treggats/fun-and-games
moved separated files to scorekeeper

separated files came from django-testing-ground
moved to a separate project