Initial commit
Fix merge
Added the JSON parser