Second commit
Merge branch 'master' of https://github.com/sbluen/djangotest.git
Second commit
add conf.py