Finishied day 1, will patch up day 2 next
Merge branch 'gh-pages' of https://github.com/jennybc/2014-01-27-miami into gh-pages