Add Testing and modify server
Merge branch 'master' of https://github.com/mtracy01/Databox