セットアップ
Merge branch 'master' of github.com:k2works/atom_introduction

Conflicts:
	README.md