Merge pull request #31 from supherman/master

Update conekta.js
Merge remote-tracking branch 'upstream/master'

* upstream/master: