.DS_Store
Merge branch 'master' of github.com:kazuman519/TaMaGuidApp

Conflicts:
	.DS_Store