Initial commit
routes and working on views
fixed merge conflicts
Merge pull request #2 from purplemartin/routes

Routes