shahid's wsgi stuff and questions
Resolve merge conflicts.
Merge branch 'master' of https://github.com/danielduan/CodeBattle