hope this doesnt break nothing:
fix merge conflict
Merge branch 'master' of https://github.com/algard/SignalRGame