password, confirmation, and invitation emails working
resolving merge conflict
where we were when ariel left on Saturday
resolving conflict
confirming and rejecting invitiations in app working
merging invitable
merging invitations
Merge pull request #42 from arieldiamond/invitations

Invitations
working on in-app invites
resolving merge conflict
user invitations working
Merge pull request #43 from arieldiamond/finishing_in_app_invites

Finishing in app invites
should fix the problem
Merge pull request #45 from arieldiamond/fix_trip_view

should fix the problem
activities
merging