got rid of commenting stuff
rid of stuff;
Merge branch 'master' of https://github.com/TeamBRS/server