Merge branch 'omniauth'

Conflicts:
	Gemfile
	Gemfile.lock
	README.rdoc
	Rakefile
	app/assets/images/.keep
	app/assets/images/start/0.png
	app/assets/images/start/1.png
	app/assets/images/start/Thumbs.db
	app/assets/javascripts/application.js
	app/assets/javascripts/matches.js.coffee
	app/assets/javascripts/scores.js.coffee
	app/assets/javascripts/teams.js.coffee
	app/assets/stylesheets/application.css.sass
	app/assets/stylesheets/matches.css.scss
	app/assets/stylesheets/scaffolds.css.scss
	app/assets/stylesheets/scores.css.scss
	app/assets/stylesheets/teams.css.scss
	app/assets/stylesheets/zombiekicker.css.sass
	app/controllers/application_controller.rb
	app/controllers/concerns/.keep
	app/controllers/matches_controller.rb
	app/controllers/scores_controller.rb
	app/controllers/start_controller.rb
	app/controllers/teams_controller.rb
	app/controllers/users_controller.rb
	app/helpers/application_helper.rb
	app/helpers/matches_helper.rb
	app/helpers/scores_helper.rb
	app/helpers/teams_helper.rb
	app/mailers/.keep
	app/models/.keep
	app/models/concerns/.keep
	app/models/match.rb
	app/models/score.rb
	app/models/team.rb
	app/models/user.rb
	app/views/layouts/application.html.erb
	app/views/matches/_form.html.erb
	app/views/matches/edit.html.erb
	app/views/matches/index.html.erb
	app/views/matches/index.json.jbuilder
	app/views/matches/new.html.erb
	app/views/matches/show.html.erb
	app/views/matches/show.json.jbuilder
	app/views/scores/_form.html.erb
	app/views/scores/edit.html.erb
	app/views/scores/index.html.erb
	app/views/scores/index.json.jbuilder
	app/views/scores/new.html.erb
	app/views/scores/show.html.erb
	app/views/scores/show.json.jbuilder
	app/views/start/index.html.erb
	app/views/teams/_form.html.erb
	app/views/teams/edit.html.erb
	app/views/teams/index.html.erb
	app/views/teams/index.json.jbuilder
	app/views/teams/new.html.erb
	app/views/teams/show.html.erb
	app/views/teams/show.json.jbuilder
	app/views/users/_list.html.erb
	app/views/users/index.html.erb
	bin/bundle
	bin/rails
	bin/rake
	config.ru
	config/application.rb
	config/boot.rb
	config/database.yml
	config/environment.rb
	config/environments/development.rb
	config/environments/production.rb
	config/environments/test.rb
	config/initializers/assets.rb
	config/initializers/backtrace_silencers.rb
	config/initializers/cookies_serializer.rb
	config/initializers/devise.rb
	config/initializers/filter_parameter_logging.rb
	config/initializers/inflections.rb
	config/initializers/mime_types.rb
	config/initializers/session_store.rb
	config/initializers/wrap_parameters.rb
	config/locales/devise.en.yml
	config/locales/en.yml
	config/routes.rb
	config/secrets.yml
	db/migrate/20141201164751_create_teams_users.rb
	db/schema.rb
	db/seeds.rb
	lib/assets/.keep
	lib/tasks/.keep
	log/.keep
	public/404.html
	public/422.html
	public/500.html
	public/favicon.ico
	public/robots.txt
	test/controllers/.keep
	test/controllers/matches_controller_test.rb
	test/controllers/scores_controller_test.rb
	test/controllers/teams_controller_test.rb
	test/fixtures/.keep
	test/fixtures/matches.yml
	test/fixtures/scores.yml
	test/fixtures/teams.yml
	test/fixtures/users.yml
	test/helpers/.keep
	test/helpers/matches_helper_test.rb
	test/helpers/scores_helper_test.rb
	test/helpers/teams_helper_test.rb
	test/integration/.keep
	test/mailers/.keep
	test/models/.keep
	test/models/match_test.rb
	test/models/score_test.rb
	test/models/team_test.rb
	test/models/user_test.rb
	test/test_helper.rb
	vendor/assets/javascripts/.keep
	vendor/assets/stylesheets/.keep