finish base.html
Merge branch 'templates'