commit1
Merge branch 'master' of https://github.com/fdavidvelasco/david.com

Conflicts:
	README.md