added the RiskGame class
occupiable and homeBase variables added and methods added
Merge remote-tracking branch 'upstream/master'
2nd Milestone
The RiskGame class now compiles. But I need to see the updates to integrate my code.
The RiskGame class now compiles. But I need to see the updates to integrate my code.
Merge branch 'master' of https://github.com/tyrioey/cs2340-team7

Conflicts:
	tomcat-todo/src/main/java/edu/gatech/cs2340/todo/model/Territory.java
Edited Brian's code
Merge pull request #1 from tyrioey/brianBStuff

Brian b stuff
adding graphics
Merge pull request #2 from wally1/master

Graphics
Merge remote-tracking branch 'upstream/master'