WIP
Merge branch 'master' into colin
Finish mocking out the nav bar
Merge branch 'colin'
Actually have a routing map for the nav bar