초기 커밋

ruby 2.1.2 버전 설치
Merge remote-tracking branch 'origin/master'

Conflicts:
	README.md