first commit
Merge branch 'gh-pages'
Simple template.
Merge branch 'master' into gh-pages

Conflicts:
	index.html