Week 7 exercises
Merge branch 'development'
Moving on to week 7