added feathers stuff
Merge branch 'master' of https://github.com/team-olympus/line-bounce