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

Conflicts:
	_layouts/default.html
	index.html