update
Merge branch 'master' of https://github.com/danyelous/portfolio

Conflicts:
	es/index.html
	index.html
general update