Merge remote-tracking branch 'chavaone/gh-pages' into revealjs
Adds slides regarding generators.
Merge remote-tracking branch 'ssice/gh-pages' into gh-pages

Conflicts:
	style.css