finish draft of navigation
merge with master
Update app.js
Merge pull request #20 from mattwojo/navigation

Navigation