retina.js
fixed merge conflict
mobile logos, background positioning
index.html merge conflict again