Initial work on image saving to DB
Resolving merge conflicts in app.js