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
Credit system added
fixed merge conflicts
Merge pull request #42 from meara/credit_system

Credit system
User not able to view meetup unless they are either a teacher or learner
Checking to see if my master was current
Merge branch 'master' of https://github.com/meara/brain_trade into meetup_cannot_be_viewed_unless_teacher_or_student
Merge pull request #43 from meara/meetup_cannot_be_viewed_unless_teacher_or_student

Meetup cannot be viewed unless teacher or student
added ajax request
add remote true for ajax
changed href to link_to