Here is the combat classes dictionary
Emissary Result Table
Merge branch 'master' of https://github.com/CS383-Sword-and-Sorcery/HW3

Conflicts:
	EmissaryResult.java
Merge branch 'master' of https://github.com/CS383-Sword-and-Sorcery/HW3