stuff and changes
Merge branch 'master' of https://github.com/RaikesCohort2013/raikesbot

Conflicts:
	scripts/ImHungry.coffee