Update App.js

merge stuff