Add Player class
Merge pull request #7 from llamapudding/master

Add Player class
fix merge conflict
fix merge conflict
Merge branch 'dkim561-master'
Remove all BlueJ config files
Merge pull request #8 from colatkinson/no_bluej

Remove all BlueJ config files