Putting log folder in the settings object.
Merge branch 'master' of https://github.com/sjdixon/spawncamping

Conflicts:
	config/index.js