to finish
finish task1_3
Merge remote-tracking branch 'origin/master'

Conflicts:
	task1.rb
	task2.rb