restored .jshintrc
Merge remote-tracking branch 'origin/matchmaking' into matchmaking