Clean up
Ignore
Git
GIT
GIT
GIT
Merge branch 'master' of https://github.com/Satachito/JpMooParaiso

Conflicts:
	JpMooParaiso.xcodeproj/project.xcworkspace/xcuserdata/sat.xcuserdatad/UserInterfaceState.xcuserstate