Finish user edit, update, index, and destroy actions
Add rake take to .gitignore
Merge branch 'master' of https://github.com/Gregism/sample_app

Conflicts:
	lib/tasks/sample_data.rake
Merge branch 'master' of https://github.com/Gregism/sample_app
alter gitignore