Login en el sistema
Merge branch 'master' of github.com:ZzAntares/curso-laravel

Conflicts:
	app/config/local/database.php
	app/controllers/LoginController.php
	app/routes.php
	app/views/login.blade.php