changed package.json name
Merge branch 'front_end'