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

Conflicts:
	index.html
PR 20141113