Chenge # 5
Change # 6
Change # 7
PR 2014/11/13 #1
Merge branch 'work' of https://github.com/k-ogawa/Semi-2014-2 into work

Conflicts:
	index.html
PR 20141113
Merge pull request #6 from k-ogawa/work

Work