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

Conflicts:
	project-6/index.html
Merge branch 'master' of https://github.com/mariaviolet/mariaviolet.github.io