added google analytics
changed things
fixed merge conflict