Removing l-buttons.jade because we will only be using layout.jade
fixing merge conflictMerge branch 'master' of github.com:mimigim/Bloom-A-Style-Guide