eliminando py~
Merge branch 'staging' of https://github.com/palichis/refactory into staging

Conflicts:
	.gitignore
correct conflicts .gitignore
Merge pull request #21 from palichis/staging

eliminación de .py~