Basic routes
Merge remote-tracking branch 'upstream/master'
Merge pull request #7 from samselikoff/master

Adds basic routes/templates