added masonry, more navbar improvements
merged conflict application.html.erb