adding more to functions lesson
merging on home computer
starting lesson 5