removed comment
Merge remote-tracking branch 'origin/Stanley's_Branch' into Ben's_branch

Conflicts:
	.classpath
	src/todologApp/Parser.java
Merge remote-tracking branch 'origin/vani's_branch' into Ben's_branch
Merging