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

Conflicts:
	css.json
Merge branch 'julianpollmann-master'