add in gitignore
Resolve conflict
Change Json format to view exhibit