now
Merge branch 'master' of github.com:TakumiBaba/DEIM2014paper

Conflicts:
	paper.md