Tweaked parser to return commandType in output
Merge branch 'parsertweak' of https://github.com/cs2103aug2014-f10-1j/main

Conflicts:
	src/stream/Stream.java