mis cambios
Merge branch 'master' of https://github.com/hectormoreno87/FinditOut

Conflicts:
	FindItOut/scr/Styles/popUpStyle.css
	FindItOut/scr/Styles/styleLogin.css
Merge branch 'master' of https://github.com/hectormoreno87/FinditOut

Conflicts:
	FindItOut/scr/Styles/popUpStyle.css
	FindItOut/scr/Styles/styleLogin.css