Merge pull request #10 from avsm/master

fix formatting of clweds13 markdown
Merge pull request #11 from avsm/master

fpx14 slides
whitespace
[git] ignore mirage droppings
[clucn14] add ref in `slides.ml`
[clucn14] add some draft content; placeholder
[clucn14] checkpoint
Merge pull request #12 from mor1/master

clucn14 slides
add some mirage slides
[clucn14] checkpoint; first cut done bar signposts
whitespace
[slides] make css refs relative not absolute, so works locally
[clucn14] checkpoint; first cut complete
whitespace
Merge branch 'master' of git://github.com/mor1/mirage-decks into mor1-master

Conflicts:
	slides/clucn14/index.html
[assets] name collision in site.css between decks and openmirage
[assets] add site.css from openmirage.org, differentiated from decks.css
[assets] now also pull in decks.css
[assets] add background image referred in site.css
Merge pull request #14 from mor1/master

whoops