deletes
Merge branch 'master' of github.com:txtadventure/psychic-octo-lana