primer commit
Users
Merge branch 'master' of https://github.com/seba2486/sample_app

Conflicts:
	.gitignore
first push