Committing to merge
Merge branch 'master' of github.com:kkburr/homework_assignments

Conflicts:
	objects/cash_register.rb
	objects/daily_use_object.rb