form commit
Merge branch 'master' of https://github.com/ga-lprieto/azteca.git