Auto-commit from DevShelf.us submit form
Merge branch 'master' of https://github.com/web-xaser/devshelf-articles into web-xaser-master

Conflicts:
	other.json
Merge branch 'web-xaser-master'