components
Merge branch 'master' of https://github.com/WartClaes/Base-HTML

Conflicts:
	.sass-cache/4082f6e928364f0aa6c1e81c04da44437f414f94/_grid.scssc
	.sass-cache/4a57301ac15ab3bfcfcfc12d90eb08cd9987f009/_base.scssc
	.sass-cache/4a57301ac15ab3bfcfcfc12d90eb08cd9987f009/_components.scssc
	css/components.css
	css/style.css
	index.html
	sass/partials/_base.scss
	sass/partials/_components.scss
changes