template adjusting
some conflict dunno why

Conflicts:
blog.php
content.php
edited conflicts
Merge branch 'master' of https://github.com/teal-seagull/tswp-theme