Tried redoing death, but didn't really work.
Merge branch 'master' of github.com:addtheletters/TSA2014