Create gh-pages branch via GitHub
Create gh-pages branch via GitHub
Merge branch 'master' into gh-pages

Conflicts:
	index.html
made the tags a comma seperated string
Merge branch 'gh-pages'