clean up - forgot to commit
Merge branch 'master' of https://github.com/matthewheston/cscw2015