pulling ada's stuff
Merge branch 'master' of https://github.com/angelafz/Ubiquity