modified:   dropbox/ppdi.pyc
	modified:   ../README.md
	deleted:    style/bg.jpg
	modified:   ../README.md
	deleted:    style/bg.jpg
Merge branch 'master' of https://github.com/bor-attila/python-indexer

Conflicts:
	README.md