Add solution and tests for the third task
Add challenge number 5
Merge remote-tracking branch 'upstream/master'
conflict resolution

Conflicts:
	tasks/03/solution.rb
	tasks/03/spec.rb