commit to test the branch
Merge branch 'user' of github.com:dsfugimoto/lims into user
Merge pull request #3 from dsfugimoto/user

User
Começo da criação da tela de novo usuario
Ignoring the .idea folder
Removing the Idea folder
Merge pull request #4 from dsfugimoto/crud

Add the CRUD features
Merge branch 'user'
Merge branch 'master' of github.com:dsfugimoto/lims

Conflicts:
	app/routes.php
Merge branch 'master' of github.com:dsfugimoto/lims into crud