ngram viewer
Merge remote-tracking branch 'origin/master'

Conflicts:
	camping/public/partials/group.html