try making html again
Merge branch 'master' of https://github.com/sbluen/djangotest.git
try again to make html go in the repo