Added solution to challenge 2 and task 1