Did a lot of stuff for website
Merge branch 'master' of https://github.com/silviaaleja/silviaaleja.github.io

Conflicts:
	index.html