logout
Merge branch 'master' into gh-pages

Conflicts:
	src/app.js
ga
ga
Merge branch 'master' into gh-pages
ga