Last minute additions
Merge branch 'master' of github.com:bug-buster/jsfoo-2013-workshop