Merge remote-tracking branch 'GitHub/master'
added json view, converted resume file to json
Added 'Edit' feature