added etherpad
Merge branch 'master' of https://github.com/wrightaprilm/ccbb_pythonspring2014