Merge pull request #20 from xtina-starr/fixes

Fixes
Merge branch 'master' of github.com:xtina-starr/colaboratoryapp into fixes