removed merge conflict markers in .gitignore
Merge branch 'master' of github.com:gtorrent/gtorrent-core
removed all.h; it doesn't work well for libraries