changed gruntfile.js
added backbone folder
merge conflicts