Table flip
Update emoticon because machuga told me to
Merge branch 'patch-1' of github.com:Bulk70/laravel-ircbot into Bulk70-patch-1

Conflicts:
	bundles/irc-general/config/triggers.php