Sarah's commit
Merge branch 'master' of http://github.com/jmazzare/language-presentation

quick merge
Merge branch 'master' of http://github.com/jmazzare/language-presentation