bug fixed
Merge branch 'master' of github.com:ttmk614/patent-NSC

Conflicts:
	parser/branch.rb