Merge remote-tracking branch 'origin/master'
change for new commit
Merge remote-tracking branch 'origin/master' into ryukoba.html
hoge
hoge
Merge remote-tracking branch 'origin/master' into ryukoba.html
hoge
implemented: demmys.html <- introduction, index.html <- my name
Merge pull request #10 from ychubachi/demmys

implemented: demmys.html <- introduction, index.html <- my name
nao215です
Merge remote-tracking branch 'origin/master'
Merge pull request #11 from ychubachi/ohsumi

Ohsumi
ujike
editted index.html
Merge remote-tracking branch 'origin/master'
Merge pull request #12 from ychubachi/nao215

nao215です
merged past edit
add eitakun
Merge remote-tracking branch 'origin/master'

Conflicts:
	index.html
変更しました