working version
tyde up
Merge branch 'gh-pages'

Conflicts:
	README.md
	ga.js
	test.js
small changes
??
Merge branch 'gh-pages'
small changes
Merge branch 'gh-pages'

Conflicts:
	test.js
Merge branch 'master' into gh-pages