static top nav bar
new updated note for heroku
Merge branch 'master' into heroku
Merge branch 'rails-3.2.13-ruby-2.0.0' into heroku