Chapter 07 changes with all files
merge