updated the server code from our offline stuff
Merge branch 'master' of github.com:flaket/ostbar
 updated stuff
Merge branch 'master' of github.com:flaket/ostbar