updating settings for test server due to accidental commit
Merge branch 'master' of https://github.com/tekton/ComicsDjango
Merge branch 'master' of https://github.com/tekton/ComicsDjango
Merge branch 'master' of https://github.com/tekton/ComicsDjango
Merge branch 'master' of https://github.com/tekton/ComicsDjango
updating for more features