commiting to pull
Merge branch 'development' of https://github.com/tdoan87/sales_engine into development

Conflicts:
	test/sales_engine_test.rb
took our all to_s on find methods