Empezando Puls
Merge branch 'master' of https://github.com/AlexNaupay/Puls

Conflicts:
	.gitignore