incoperated
Merge branch 'gh-pages' of https://github.com/Chanutphon/blacksheepschool into gh-pages

Conflicts:
	_config.yml