try multiple index
resolve major conflicts
resolve conflicts
Merge remote-tracking branch 'origin/master' into multiple-index
Multiple indices works - for delete, complete, uncomplete
Merge branch 'master' of https://github.com/cs2103aug2014-t11-4j/main

Conflicts:
	indigoSrc/Parser.java