Added excercises
Resolved conflict
Resolved another stupid conflict, since I did not push befor