formatting fix
config
Merge branch 'master' of github.com:estreske/CRUD_group

Conflicts:
	config/database.yml
testing out delete in index
fixing merge conflict