Change App.js

 - Merge App.js
 - Change wording