Added 24 hours alt of !time
Merge branch 'master' of https://github.com/mrphlip/lrrbot

Conflicts:
	commands/misc.py