Collin Partee 11/5
Merge branch 'master' of http://www.github.com/alastor-lee/codekillers