Removed @company.logo from _header.html.erb
merging pundit with master