Merge branch 'master' into gh-pages
Merge branch 'gh-pages' of github.com:fourkitchens/dca2013 into gh-pages