Fixed simultaenous updating of statuses
Merging with master
war
war
gameManager fixes
Fixed null exception in lobby widget
really crappy merge...sorry linus
war
fixed merge
modified git ignore
merge conflict
working steps up to troop placement
modifying gameplay widget. can place troops with difficulties. added a lot of comments
updated gitignore
.gitignore now working
before merge
merge
removed war files
removed war
Merge branch 'master' of https://github.com/kjian279/RISC