3rd change
Merge branch 'new_feature'

Conflicts:
	palindrome-validator.js