changed size of gravatar image
getting rid of this branch
added conditions for pending meetups as both student and teacher
fixed merge conflict in factories spec
more awesome changes
Merge branch 'master' of https://github.com/meara/brain_trade into pending_or_canceled
displaying pending meetups on user profiles WIP
Update meetups_controller.rb

removed a weird comma in the create method
user profile has pending, confirmed meetups
fixed merge conflict
Merge pull request #41 from meara/pending_or_canceled

Pending or canceled
fixed merge conflicts