Aplicacion Recien Creada
Merge branch 'master' of https://github.com/iblake/learning

Conflicts:
	.gitignore