Revert "Trolling"

This reverts commit b6f031e37d1b9596413d3ef9c60d78886ebab42f.

Conflicts:
	commands/gif/gif.go
Merge branch 'master' of https://github.com/fabioxgn/go-bot