Fixes in..days thing.
Resolves conflicts.

Conflicts:
	app.rb
Make assignment more rubyish.
Fixes errors.
Merge branch 'master' of github.com:pferdefleisch/budbot

Conflicts:
	app.rb