Solve Conflict

Conflicts:
	indigoSrc/InputWindow.java