edit and delete button test
Merge branch 'master' of https://github.com/geronimod/ideas

Conflicts:
	spec/controllers/ideas_spec.rb