Arreglado conflicto

Change-Id: Ib7b173ddd63c937bdb6d6ff25ec5f8e00896efa4
Signed-off-by: Jonathan Palma <jonathanpalma9@gmail.com>
Merge branch 'master' of
https://github.com/JhonnyPalma/Proyecto-SITEP.git

Conflicts:
	SITEP/SITEP/Utils/imap.py