Added social buttons
fixed conflict
Merge branch 'develop' into staging
Added google analytics
Merge branch 'develop' of github.com:foglerek/bitstarter into staging