frequency analysis
Merge branch 'master' of https://github.com/gdi2290/RedditInsight

Conflicts:
	public/templates/compiled/templates.js