Merge pull request #1 from Diffeomorphism/master

Added basic page routing and layouts, as well as some logic.
updated html templates and routing
fix dependency bug
Merge pull request #2 from bplatta/template-main

Template main