new changes
Merge branch 'gh-pages' of https://github.com/chetanraj/devessentials into gh-pages

Conflicts:
	json/data.js