Improved protocol and cleaned code a bit
Updated gitignore to ignore kdevelop directory
Fixed conflicts
This should fix test failing
Merge branch 'master' of https://github.com/mannol1/toxcore
Fixed warning.