Merge pull request #1 from mathgeek/master

Finish layout and routes