trying to resolve conflicts
Merge branch 'master' of https://github.com/VoctecTroubleshooting/Game
more changes