Server-side Testing, Bug Fixes
Merge branch 'master' of github.com:PuffNStuff/NoTpl

ulled README.md