Small server bug fix
Bug fixes
Merge branch 'master' of github.com:dabbler0/ceeo_nao_project