renamed ourapp.js to client.js
merge
merge