started merge / migrate
ex6
lesson 6 step 1
notes
finished ex6