Included log file in settings.
Fixed up conflicts.

Conflicts:
	README.md
	sample.json