Create database.
Merge branch 'master' of github.com:heathered/task-project

Conflicts:
	config/database.yml
Merge branch 'master' of github.com:heathered/task-project