getting up to date
assignment 3 completion
merging changes into master

Conflicts:
	unit_3/lesson_2/assignment_4/pets_to_add.py