Finishing GPL-ing it.
Finishing GPL-ing the bot.
Merge branch 'master' of github.com:rawsonj/triviabot

Conflicts:
	trivia.py