Master scss file update with new file imports
Merge branch 'master' of https://github.com/doodleboxmedia/SassTemplate