updates
Merge branch 'master' of https://github.com/arnoldgamboa/amtgipad
pull changes