変更from1
Merge branch 'master' of https://github.com/enyon/tutorial

Conflicts:
	POSCAR