kv.properties
EOL LF
Merge branch 'master' of https://github.com/cfly/feedc.git

Conflicts:
	.classpath