Log. Very Important, don't lose it.
Merge remote-tracking branch 'refs/remotes/origin/master'

Conflicts:
	smtlib.log