not important
fixed tests after merge
mostly done with css/design
not important
Activities route, rsvp function working - show jade lists attendees
Resolved merge conflicts
nothing important
fixed merge conflict
re-styled profile show page
Front-end: message functionality works
finished styling activity show page
Merge branch 'user' into design
search button added
moment available in jade
Front end: search function works
show message page styled
Merge branch 'user' into design
Front end: maxDistance search added to dashboard jade
conflicts fixed
Merge branch 'user' into front-end