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

Conflicts:
	js.json
Merge branch 'cheshirsky-master'