Removed .idea folder from git
Merge branch 'master' of github.com:systemtwo/allegiances-and-nemeses
Client rendering and reorganization