Exercise 1
I think i fucked up
Merge branch 'static-pages'
Exercise 2