site restart
Merge branch 'master' of https://github.com/dddiaz/danieldelvindiaz.com

Conflicts:
	assets/css/main.css
	elements/my-sidebar/my-sidebar.css
	elements/my-sidebar/my-sidebar.html
	index.html