initial commit. Exercise 1.3
merge