Merging week 3 to master, so I can then create week 4 branch