clearing attack and defend
Merge branch 'master' of https://github.com/hdxconnor/risque