content doc and images
Merge branch 'master' of https://github.com/graphitefriction/oscon-2013-docs-workshop