Merge branch 'gh-pages'
add scss files with missing bootstrap elements
add definitions in sass file
fix line_height bug on em font-size
fix variables bugs with mixins and cards
fix
Merge branch 'master' into gh-pages