WIP
this is a clusterfuck
Merge branch 'master' of github.com:Strider-CD/strider