very badly written code ahoy
Merge branch 'master' of github.com:sharuma/Trochilidae