Merge pull request #18 from shankari/master

Remove references to Tom and me in the test data
Merge pull request #30 from shankari/master

Get the choice screen to work as well