initial
Merge branch 'master' of https://github.com/chris-held/teamstream-nofeather