asas
Merge branch 'master' of https://github.com/wolv16/ioa

Conflicts:
	app/views/artesano/registroArtesano.blade.php