First pages commit
getJSON
Merge branch 'master' into gh-pages

Conflicts:
	index.htm
	master.js
Site Rework