roles actually get set now
fixed merge on game logic h
Merge branch 'master' of https://github.com/rbellido/Project