bootstrapped
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	Gemfile
	app/controllers/layers_controller.rb
	app/controllers/locations_controller.rb
	app/controllers/triggers_controller.rb
	app/models/layer.rb
	app/models/trigger.rb
	app/views/layers/_form.html.erb
	app/views/layers/index.html.erb
	app/views/layers/new.html.erb
	app/views/layers/show.html.erb
	app/views/locations/_form.html.erb
	app/views/shared/_user_info.html.erb
	app/views/static_pages/home.html.erb
	app/views/triggers/show.html.erb
	config/routes.rb
	db/schema.rb
	spec/controllers/layers_controller_spec.rb
	spec/factories/layers.rb
	spec/views/layers/edit.html.erb_spec.rb
	spec/views/layers/index.html.erb_spec.rb
	spec/views/layers/new.html.erb_spec.rb
	spec/views/layers/show.html.erb_spec.rb
redid css