Change done exclusively to generate a merge conflict
Updating Google Analytics code
A little bit more of help.
More info on point 7.
Merge branch 'gh-pages' into conflict-branch

Conflicts:
	index.html

Escoger como version el valor 2.002