テスト
Merge branch 'master' of github.com:kmoritagr/SmallTimer

Conflicts:
	.gitignore