added bourbon and changed to sass files
merge conflict resolved
applied basic styles header and footer
rewrite history