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
bug fixes, meetups via hangouts or in person
Delete teacher_meetups_helper.rb
Delete _teacher_meetup_list.html.erb
Merge pull request #44 from meara/hangout_or_in_person

bug fixes, meetups via hangouts or in person
Merge branch 'master' of https://github.com/meara/brain_trade into ajax_browsing
css and ajax mostly complete, propagation issue still