7/11/2013
Merge branch 'master' of https://github.com/beason3/cs2340-team7-1 into beason3-master

Conflicts:
	tomcat-todo/src/main/java/edu/gatech/cs2340/todo/controller/TodoServlet.java
	tomcat-todo/src/main/java/edu/gatech/cs2340/todo/model/Unit.java
Merge pull request #6 from wally1/master

Wali's DOM/Graphics Commit
M4
Merge branch 'master' of https://github.com/tyrioey/cs2340-team7