Creacion de carpetas para estados de scrum
Merge branch 'master' of https://github.com/macartuche/architects

Conflicts:
	app/routes.php
Merge branch 'master' of https://github.com/macartuche/architects

Conflicts:
	app/routes.php
Formulario para miembros y modelo para materiales
Merge branch 'master' of https://github.com/macartuche/architects

Conflicts:
	app/routes.php
	app/views/layouts/projects/edit.blade.php
Merge branch 'master' of https://github.com/macartuche/architects
mezcla