adds some stufff
compliance logic in merchant, saq, and scan models stablized
sets up current_saq, current_scan in controller, view now not seeing errors, edits compliance_expiration_date in merchant model to immediately return saq expiration date if they don't require scan (instead of comparing the two dates)
adds status methods to both saq and scan models, updates merchant show view to include these rather than thee pass method
installs ffaker, xray, guard minitest gems
changed username on db config file, setting up testing
Merge branch 'complianceLogicNew' of https://github.com/tschmidty/Compliance into complianceLogicNew

Conflicts:
	app/models/merchant.rb
	app/views/merchants/show.html.erb

  ^^^ these were solved