Merge branch 'master' of github.com:forbetaorworse/trend_bot

Conflicts:
	src/scripts/facetogif.coffee
Merge branch 'master' of github.com:forbetaorworse/trend_bot