Cambios de Oscar Ulloa
New quote
Merge remote-tracking branch 'upstream/master'

Conflicts:
	code/monterrey.html

New Change Monterrey
Revieweing details
Merge pull request #18 from carlosepp/master

Cambios de Oscar Ulloa