worked on lesson 7
merged
removed file
cleaned up
cleaned up
cleaned up