Updated challenges

Finished challenge 2, 6 and 7