changes to migrations
fixed merge conflicts
Merge remote-tracking branch 'upstream/master'
adding jQuery views
adding user to meets
change to schema
added seed data
Merge pull request #4 from kaplanoah/master

Seed data for users, invites, meets and their associations