changes to application.html.erb, items/new.html.erb, root/contact.html.erb, nav bar, search controller, etc
Merge branch 'master' into chelsea