'commit 인덱스의 상태를 기록하기' added
Merge branch 'master' of https://github.com/rheehot/tutorial

Conflicts:
	sample.txt