Added task 3
Merge remote-tracking branch 'upstream/master'
added test file