Project fixed
Merge branch 'master' of https://github.com/gob94/PolApp
Project fixed
Conflicts:
	src/com/thinksoft/login/SignIn.java