Merging in changes to logo and web.js
Added the pink square shortcut icon