=
Merge branch 'gh-pages' of https://github.com/specialflower/test.git into gh-pages

Conflicts:
	_layouts/default.html