Closes #27 Cleaned up testing code.
Merge branch 'master' into analysis

Conflicts:
	src/cscie99/team2/lingolearn/server/confuser/Confuser.java