added basic nav
Merge branch 'dev-aaron'