hopeful fix
Merge branch 'master' of https://github.com/Kemezie/ReasontoProcrastinate

Conflicts:
	README.rdoc
	Rakefile
	config.ru
	public/404.html
	public/422.html
	public/500.html
	public/robots.txt
	test/test_helper.rb