this is for you ryan
multiple photo upload functionality for user model
fully-functional search
Merge branch 'master' of https://github.com/kelleystephens/dating
Samantha Yeargin and I fixed the query
merge conflicts resolved
merged master
activity.js commit
Merge branch 'master' of https://github.com/kelleystephens/dating
fixed tests after merge
Activities route, rsvp function working - show jade lists attendees
Resolved merge conflicts