Parrot code from Joe polished
Merge branch 'master' of github.com:turion/hacknotts14
Merge branch 'master' of github.com:turion/hacknotts14