seeds
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
Merge remote-tracking branch 'origin/master'

Conflicts:
	Gemfile
	Gemfile.lock
	app/controllers/guests_controller.rb
	app/models/guest.rb
fuzzy search on composite fname lname email
js services
angular routes