3 commits

Author	SHA1	Message	Date
dginovker	32b3542f94	Added json simple lib and fixed Verenia's crap	2019-06-08 17:07:37 -04:00
verinia	b865befb0b	Big woah	2019-06-08 13:03:40 -08:00
verinia	101b8314c9	Rebase with upstream	2019-05-28 22:15:17 -08:00