added units and territory displays
blah
cleaned up code, added useful comments, added some helper methods
Merge branch 'master' of https://github.com/beason3/cs2340-team7-1 into beason3-m5

Conflicts:
	tomcat-todo/src/main/java/edu/gatech/cs2340/todo/controller/TodoServlet.java
	tomcat-todo/src/main/java/edu/gatech/cs2340/todo/model/Player.java
	tomcat-todo/src/main/java/edu/gatech/cs2340/todo/model/RiskGame.java
	tomcat-todo/src/main/java/edu/gatech/cs2340/todo/model/Territory.java
	tomcat-todo/src/main/java/edu/gatech/cs2340/todo/model/Unit.java