not important
activity.js commit
Merge branch 'master' of https://github.com/kelleystephens/dating
fixed tests after merge
mostly done with css/design
not important
Activities route, rsvp function working - show jade lists attendees
Resolved merge conflicts
Front-end: message functionality works
Front end: search function works
conflicts fixed