Changed factors.rb to use explicit arguments instead of named arguments.
Fixed conflicts.

Merge branch 'master' of https://github.com/euclidjda/simsearch

Conflicts:
	app/controllers/frontdoor_controller.rb
	app/models/factors.rb