delete README and update database.yml
Merge branch 'master' of github.com:heathered/Task-Project

Conflicts:
	README.rdoc
	config/database.yml
Merge branch 'master' of github.com:heathered/Task-Project