First draft of skimage novice blog post
Fixed conflicts
Added novice blog post
Added novice blog post
Merge branch 'master' of github.com:synesthesiam/site
Removed old blog post
Merge branch 'master' of github.com:swcarpentry/site
Update post date and red example
Blog post summarizing discussion so far about scientific publishing in a webby world
Merge pull request #304 from gvwilson/master

Removing canceled Indiana bootcamp
Changing default mailing address and putting contact email in footer
Merge pull request #306 from gvwilson/changing-default-email-address

Changing default mailing address and putting contact email in footer
Blog post about Andromeda's blog post
Updates to blog post based on feedback
Andromeda Yelton's blog post
Merge pull request #307 from gvwilson/blog-librarian-bootcamp

Post about Andromeda Yelton's post on the librarian bootcamp
Merge pull request #303 from gvwilson/blog-web-publishing

Blog post summarizing discussion so far about scientific publishing in a webby world.
Merge branch 'master' of github.com:synesthesiam/site into synesthesiam-master
Editing out the notebook-specific stuff in Mike Hansen's post
Don't need the highlighting Javascript