Merge branch 'tests'
Merge branch 'master' of github.com:pyrohail/SimpleServer