Merge branch 'master' of https://github.com/nokamoto/fackln into infix

Conflicts:
	src/fackln/binary_tree_expression.cc
	src/test/grammar_test.cc