Integrating with Kevin's trade backend
Merging with Kevin
Merge branch 'master' of https://github.com/kjian279/RISC
Working on frontend bugs in trades/alliances