correcciones
Merge branch 'master' of https://github.com/clases04072014/Cristofer

Conflicts:
	.gitignore
	Estadistica/nbproject/build-impl.xml
	Estadistica/nbproject/genfiles.properties
	Estadistica/nbproject/project.xml
	Mayusculas/nbproject/private/private.xml