sample2
test commit
added new file
added settings
config change
Merge remote-tracking branch 'origin/master'

Conflicts:
	README.md