Twitter branch

Bringing the first presentation's code into the master branch