Working on week5
Fixing conflicts
Re-adding week 4