Commit Inicial
Merge branch 'master' of https://github.com/manu10/teamRocket

Conflicts:
	.gitignore