# Conflicts:
#	Configuracion_vhost.txt
#	prueba/.idea/php.xml
#	prueba/.idea/prueba.iml
#	prueba/app/Http/Controllers/UserController.php
#	prueba/composer.lock
#	prueba/resources/views/layout.blade.php
#	prueba/resources/views/users/create.blade.php
#	prueba/resources/views/users/edit.blade.php
#	prueba/resources/views/users/index.blade.php
#	prueba/resources/views/users/show.blade.php
#	prueba/routes/web.php
#	prueba/tests/Feature/pruebaTest.php