.,oj
Merge branch 'master' of https://github.com/B-DAP/B-DAP.github.io

Conflicts:
	_layouts/default.html