stash
Merge branch 'master' of github.com:darkwisperer/CCS