not sure what's up
added comments and begun work on claim button
Merge branch 'master' of github.com:emmya/gimme
Merge branch 'master' of github.com:emmya/gimme
merged because of a bug fix emmy made
more comments and work towards claim buttons, claim buttons now only appear where they should
Claim is working
Merge branch 'master' of github.com:emmya/gimme

Conflicts:
	app/assets/javascripts/script.js
	app/assets/javascripts/templates/new_item.hbs
	app/assets/javascripts/wishlists.js
	app/views/wishlists/show.html.erb
debugging emmy/matt
lol now everything is functioning
Fixed edit button and delete button works completely for wishlists
fixed the edit button