this does not do much yet
Merge branch 'master' of github.com:TeamBRS/server