Updated junit test for parser. Now it should be ok.
Removed older version of parser test.
Merge branch 'master' of https://github.com/cs2103aug2014-f10-1j/main

Conflicts:
	src/stream/Stream.java
Added the correct parser junit test shown last week.
Merge branch 'master' of https://github.com/cs2103aug2014-f10-1j/main
Deleted some unused tokens on my computer