Remove gitignored files from cache
Fix client syntax bugs in app.js
Fix merge conflicts