commit #2 - images and slides
big update
final commit
cbdw 2014 updates
Merge branch 'gh-pages'

Conflicts:
	css/ckh-preso.css