References update!
Merge branch 'master' of https://github.com/oscar-d-rodriguez/EALA

Conflicts:
	code/argentina.html
	code/bratislava.html
	code/casa.html
	code/monterrey.html
Merge remote-tracking branch 'upstream/master'