Merge branch 'trades-and-alliances' of github.com:amni/RISC into trades-and-alliances
fixed syntax bug
Merge branch 'trades-and-alliances' of github.com:amni/RISC into trades-and-alliances
add tests
Merge branch 'master' of github.com:amni/RISC into trades-and-alliances
start of adding second turn mode
changed allies to simpler form
started adding frontend for alliances
more changes to add alliance view
got ally requests working
alliances ready to be slotted in
start of adding trades
more trade frontend changes
Updates to add trade chooser
added trades alliances modal view
Trade model working with modal on frontend
Merge branch 'master' into trades-and-alliances
starting to connect trades to backend
Update API_doc_V2.md
changed models