ignoring .classpath
accepting .classpath
eclsipe conf
ignoring target
Merge branch 'master' of https://github.com/jgarbora/ts

Conflicts:
	.gitignore
monster rss