kajds;
Merge branch 'master' of https://github.com/daivssamuel997/davissamuel997.github.io

Conflicts:
	unit1_week1/favorite_websites.html
	unit1_week1/wireframe.html