Merge pull request #40 from sli-fox/marky_branch

Marky branch
Remove points and lives from playa
Merge branch 'master' of https://github.com/sli-fox/jamms into steph_branch
Merge pull request #41 from sli-fox/steph_branch

Steph branch
Fixing Mark's mistake with Blacky
Updated splash screen
Merge pull request #42 from sli-fox/steph_branch

Fixing Mark's mistake with Blacky
Merge branch 'master' of https://github.com/sli-fox/jamms into marky_branch