Fix timestamp stuff
Merge branch 'timestamp' into muh

Conflicts:
	app/chatbot.rb