Architectural merge from exercise 1
Append log file to gitignore
Exercise 1 skeleton