Fotos de Artistas.
Merge branch 'master' of https://github.com/olmo/portfolio

Conflicts:
	protected/controllers/ArtistasController.php