test
Merge branch 'master' of https://github.com/jpallares/minimal-mistakes

Conflicts:
	_config.yml