updated parrot
Merge branch 'master' of https://github.com/michglass/glass-master