Added modal for user input and underscore.js
fixed merge conflicts