Merge branch 'master' of https://github.com/robertiyo14/PracticaListView

Conflicts:
	.gitignore
Merge branch 'master' of https://github.com/robertiyo14/PracticaListView

Conflicts:
	.gitignore