updating jquery and logos
resolving merge conflicts on header