Merge branch 'master' of https://github.com/henkholtrop/henkholtrop.github.io

Conflicts:
	css/.sass-cache/a3738d6037bd2cee7545d276a63fc12dabc2d36d/_buttons.scssc
	css/.sass-cache/a3738d6037bd2cee7545d276a63fc12dabc2d36d/_color.scssc
	css/.sass-cache/a3738d6037bd2cee7545d276a63fc12dabc2d36d/_login.scssc

css/.sass-cache/a3738d6037bd2cee7545d276a63fc12dabc2d36d/_notifications.
scssc
	css/.sass-cache/a3738d6037bd2cee7545d276a63fc12dabc2d36d/_popups.scssc

css/.sass-cache/a3738d6037bd2cee7545d276a63fc12dabc2d36d/_typography.scs
sc
	css/.sass-cache/a3738d6037bd2cee7545d276a63fc12dabc2d36d/style.scssc
	css/style.css
	index.html
clear files