modified:   images/bkg.png
	modified:   index.html
Merge branch 'gh-pages' of https://github.com/karl-lensson/C-of-Functions into gh-pages

Conflicts:
	index.html