base framework
Merge branch 'gh-pages' of github.com:fusion94/humor into gh-pages

* 'gh-pages' of github.com:fusion94/humor:
  Update index.html

Conflicts:
	index.html