moved post.html and base.html to view/
bootstrap finally got itself together
fixed merge conficts