no hice cambio
Merge remote-tracking branch 'origin/master'

Conflicts:
	_notes/dwsync.xml
Merge branch 'master' of https://github.com/ingdannyhernandez/indc0nd0r