Merge pull request #1 from mathgeek/master

Finish layout and routes
Merge pull request #2 from mathgeek/filling-in-layout

Merge pull request #1 from mathgeek/master