foundation, seeds.rb
Merge branch 'branch1' into linda

Conflicts:
	compas/app/models/user.rb
	compas/app/views/layouts/application.html.erb
	compas/db/schema.rb
	compas/db/seeds.rb
fixing merge differences
TEST Branch Fully Updated.
Seed file updated for new relationships.
changes
Seed files updated again.
Event/User relationship beginnings.
changes
gemfile
arbitrary
omniauth facebook
Event and Category relationship established.
Event and Org relationship updated.
Creation/edit/destroy controls added. Seed files updated.
Event/User attending join migration added.
testing
Merge branch 'linda' into TEST

Conflicts:
	compas/.idea/misc.xml
	compas/.idea/modules.xml
	compas/.idea/vcs.xml
	compas/.idea/workspace.xml
	compas/db/schema.rb
	compas/db/seeds.rb
seed edits
Facebook integration.