First Change
Cambiando los forms html por forms de Form Class de Laravel
Merge branch 'master' of https://github.com/Ferchoner/laravel

Conflicts:
	app/views/registro.blade.php