Code
Merge branch 'master' of https://github.com/FIDEL7/Progra_1_2014_Fidel_Castro

Conflicts:
	.gitignore