Squash bug, add test for adding membership
Changed membership controller to be more like students

Removed merge from params, used @project.memberships.whatevs, squashed resulting bug
Whitespace
User can edit a membership TEST