Merge branch 'feature/paren-match'

Conflicts:
	buffer.c
	ui.c