Dummy Comitt
Git animo!
Merge branch 'master' of https://github.com/Satachito/JpMooParaiso

Conflicts:
	JpMooParaiso.xcodeproj/xcuserdata/sat.xcuserdatad/xcschemes/LauncherTest.xcscheme