thinking sphinx working
gitignore changed for sphinx
merge conflict solved