Uploading task 06

Conflicts: