Solve Conflict

Conflicts:
	indigoSrc/InputWindow.java
Upload classes
Merge remote-tracking branch 'origin/fixing-logic'
Merge branch 'master' of https://github.com/cs2103aug2014-t11-4j/main