commit to pull
Merge branch 'jsonBranch' of https://github.com/armoredsoftware/protocol into jsonBranch
Merge branch 'jsonBranch' of https://github.com/armoredsoftware/protocol into jsonBranch
Merge branch 'jsonBranch' of https://github.com/armoredsoftware/protocol into jsonBranch
Merge branch 'jsonBranch' of https://github.com/armoredsoftware/protocol into jsonBranch
Merge branch 'jsonBranch' of https://github.com/armoredsoftware/protocol into jsonBranch
Merge branch 'jsonBranch' of https://github.com/armoredsoftware/protocol into jsonBranch
Merge branch 'jsonBranch' of https://github.com/armoredsoftware/protocol into jsonBranch
Merge branch 'jsonBranch' of https://github.com/armoredsoftware/protocol into jsonBranch
Merge branch 'jsonBranch' of https://github.com/armoredsoftware/protocol into jsonBranch
Merge branch 'jsonBranch' of https://github.com/armoredsoftware/protocol into jsonBranch
Merge branch 'jsonBranch' of https://github.com/armoredsoftware/protocol into jsonBranch
Merge branch 'jsonBranch' of https://github.com/armoredsoftware/protocol into jsonBranch
Merge branch 'jsonBranch' of https://github.com/armoredsoftware/protocol into jsonBranch
Merge branch 'jsonBranch' of https://github.com/armoredsoftware/protocol into jsonBranch
Merge branch 'jsonBranch' of https://github.com/armoredsoftware/protocol into jsonBranch
Merge branch 'jsonBranch' of https://github.com/armoredsoftware/protocol into jsonBranch
pushing so that Justin can break stuff with a clear conscience
Merge branch 'jsonBranch' of https://github.com/armoredsoftware/protocol into jsonBranch