Some stuff
Merge branch 'master' of github.com:akbiggs/EmotionIsland
fixes to attacks