fixed negative troop issue
Merge branch 'master' of https://github.com/amni/RISC
Merge heroku.com:riscgame
fix for upgrade and move/attack