subida a aws
Merge branch 'master' of https://github.com/carlost7/yoamomx

Conflicts:
	.gitignore