tmp
急行と普通の統合finished
Merge branch 'ver2'

Conflicts:
	data/data_seq.js
	js/script.js
fixed conflicts