basic routes in
Merge branch 'master' into mvp_routing
Merge pull request #6 from nairys/mvp_routing

Mvp routing