20130720 updated

 almost complate editting part.
Merge branch 'master' of https://github.com/kaz-igu/homework

Conflicts:
	.DS_Store
	goto(horie)/.DS_Store