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
changes
changes
gemfile
arbitrary
omniauth facebook
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