wtf?
Merge branch 'master' of https://github.com/uirobot/beysbets

Conflicts:
	Gemfile
	Gemfile.lock
	app/assets/javascripts/application.js
	app/assets/stylesheets/application.css
	app/assets/stylesheets/bets.css.scss
	app/controllers/application_controller.rb
	app/controllers/bets_controller.rb
	app/helpers/application_helper.rb
	app/helpers/bets_helper.rb
	app/models/bet.rb
	app/models/user.rb
	app/views/bets/index.html.erb
	app/views/devise/registrations/edit.html.erb
	app/views/devise/registrations/new.html.erb
	app/views/devise/sessions/new.html.erb
	app/views/layouts/application.html.erb
	config/application.rb
	config/environments/production.rb
	config/initializers/devise.rb
	config/routes.rb
	db/schema.rb
	db/seeds.rb