2nd Milestone
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