das
Merge remote-tracking branch 'origin/master'

Conflicts:
	Gemfile
	app/assets/javascripts/main.js
	config/locales/es.yml
	db/schema.rb
sad
Merge remote-tracking branch 'origin/master'
alerts