trying to get edit params working
Merge pull request #35 from ilanasufrin/ben_branch

Fixes user persistence (again) in show page
in the middle of merge conflicts
fixing merge conflicts
Merge pull request #36 from ilanasufrin/ben_branch

Ben branch
Fixes merge conflicts