progress
Merge branch 'master' of github.com:icoderaven/slytherin_dagger