gh-pages
updated readme
Merge remote-tracking branch 'origin/gh-pages'

Conflicts:
	README.md
	jsindentator/test/formattingjstest1.html