Player in main
Merge branch 'master' of https://github.com/seamusoneill/GamecraftCork