Merge pull request #21 from elElmo/master

Implemented player reserves deployment phase
Battle sequence complete

Battle to the death
Battle attack complete.
Merge pull request #22 from elElmo/master

Modifying user_input for territory choose to allow multi-deploys
Complete merge with master.
Merge branch 'master' of https://github.com/sfucmpt105-beta/risk
Merge remote-tracking branch 'upstream/master'
Fixing merge errors