Battle sequence complete

Battle to the death
Battle attack complete.
Complete merge with master.
Merge branch 'master' of https://github.com/sfucmpt105-beta/risk