test
maerge
Merge branch 'master' of https://github.com/sakaki0214/first_app

Conflicts:
	.gitignore