samples and nav
Merge branch 'master' of https://github.com/Lexas/Portfolio