modifying to 4.2
Merge branch 'day4' into day5
modifying to 4.2 and merge from day4