changes to migrations
fixed merge conflicts
Merge pull request #2 from gthetwong/master

Implementing Devise
Merge remote-tracking branch 'upstream/master'
Merge pull request #3 from gthetwong/master

added some styling, jquery for hide and show on main content divs, and b...
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
commit new seed data from merge