add object
remove object
add file
Merge branch 'master' of https://github.com/tkoyama010/bem

Conflicts:
	doc/theory.lyx