Fix artist name
Merge branch 'master' into fix-artist-name

Conflicts:
	views/curriculum_vitae.haml
Merge pull request #17 from rafaelgonzalez/fix-artist-name

Fix artist name