Added google analytic tracking and made images art
Fixed merge conflicts