removed cluttering stuff and prepared for sync
Merge branch 'master' of github.com:xlcteam/scoreboard