metodo acomodado
Merge branch 'master' of https://github.com/monolinux/demoFlask

Conflicts:
	.idea/workspace.xml
	class_login.pyc
agregando la libreria de mysql