record logic
wait method
Merge remote-tracking branch 'origin/abimael' into say

Conflicts:
	app.py
Arreglando las cosas de Abi ^.^
Merge remote-tracking branch 'origin/xio' into say

Xiomara metiendo files a lo loks

Conflicts:
	app.py
El primer gran merge