player stuff
Merge branch 'master' of https://github.com/axprin/pitches_and_rows into testing
added player
fixed merge conflicts
Merge pull request #11 from axprin/testing

Testing