Merge branch 'master' of https://github.com/debugwand/fedbot

Conflicts:
	scripts/google-images.coffee