Fixes to attack, Win Screen'
Merge pull request #39 from sjklein92/master

Fixes to attack, Win Screen