Cleaning up
Cleaning up
I have conflicts
Merge branch 'jsonBranch' of https://github.com/armoredsoftware/protocol into jsonBranch