changes to user chart
Merge branch 'master' of github.com:gdi2290/RedditInsight

Conflicts:
	views/index.html
Merge branch 'master' of github.com:gdi2290/RedditInsight
Merge branch 'master' of github.com:gdi2290/RedditInsight
took out unneeded console.log
Merge branch 'master' of https://github.com/gdi2290/RedditInsight
fix active tab error
Merge branch 'master' of https://github.com/gdi2290/RedditInsight
Merge branch 'master' of https://github.com/gdi2290/RedditInsight
Merge branch 'master' of https://github.com/gdi2290/RedditInsight
fixed superscrollorama bug when dashboard is hidden
Merge branch 'master' of https://github.com/gdi2290/RedditInsight
Merge branch 'master' of github.com:gdi2290/RedditInsight
Hover style for frequency analysis circles
add fixed navbar
Merge branch 'master' of https://github.com/gdi2290/RedditInsight
took out throw from server error
took out commented code
Merge branch 'master' of https://github.com/gdi2290/RedditInsight
convert © to html &copy;