logo padding backwards, fixed
conflct resolution
added correct google tracking code