Merge branch 'master' of https://github.com/karynazaslavska/karynazaslavska.github.io

Conflicts:
	Project 4/index.html
	Project 4/shrimp.jpg
	Project 4/style.css
project 4

project 4