changing the format of the json
update git ignore
finish merge