derp
more derp
herp derp
how do I derp
Merge branch 'master' of https://github.com/Twirlie/Rin

Conflicts:
	bot.js
	config.json