Exercise 1 (hopefully) completed
Final commit for exercise 3