The rest of the lesson
Merge from Arun
Merge branch 'master' of github.com:wdi-sf-september-2014/notes