added screenshots from homework
completing merge