JMPTextField
Merge remote-tracking branch 'origin/master'
gitignore
Merge branch 'master' of https://github.com/Satachito/JpMooParaiso

Conflicts:
	.gitignore