interaction flow for learner and teacher pages customized
fixed merge conflict
Merge pull request #39 from meara/meetup_interaction

interaction flow for learner and teacher pages customized
Merge branch 'master' of https://github.com/meara/brain_trade into pending_or_canceled
displaying pending meetups on user profiles WIP
user profile has pending, confirmed meetups