README.md update in site branch
Merge branch 'gh-pages' into initial_jekyll

Conflicts:
	README.md