Added simple logging and minor improvement
Merge branch 'master' of https://github.com/cs2103aug2014-f10-1j/main

Conflicts:
	src/parser/StreamParser.java