updated user_stories.txt
sale.rb
Merge branch 'master' of https://github.com/jihunkang/monthly_payroll

Conflicts:
	sale.rb
	user_stories.txt