please work
Conflicts:
	src/edu/grinnell/csc207/groupgroup/utils/InvalidInputStringException.java
	src/edu/grinnell/csc207/groupgroup/utils/UnknownRegisterException.java