Tested Alliances and made changes to frontend
Merge branch 'master' of https://github.com/kjian279/RISC