First Commit
Merge branch 'gh-pages'

Conflicts:
	google/index.html
	youtube/index.html