error in #created-by on landing page
Merge branch 'master' into greg
Merge branch 'master' into greg
added tests to navbar_spec.rb
Merge branch 'master' into greg