fixing merge of stashed scss
adding bootstrap 3.1.1 js
removing variables em scss
fixing build of js and editor styles with bootstrap 3.1.1
removing extra lines and changing jquery ready statement in script.js
adding main.js
Merge pull request #14 from voceconnect/bootstrap3.1.1

Bootstrap3.1.1