Merge branch 'master' of github.com:macie/macie.github.io

Conflicts:
	_layouts/default.html
	css/default.css