Added pretty much nothing. Reorganized player info in game
Merge branch 'master' of https://github.com/aminitani/Project3
resolving merge conflict