Initial commit including chapter 2 folders and files
Merge origin/master