Tidy up
Merge branch 'master' of github.com:ellcom/Candidate-Match

Conflicts:
	config.php