added strings
Merge branch 'Stanley's_Branch' of https://github.com/cs2103aug2014-t11-3j/main into Stanley's_Branch

Conflicts:
	src/todologApp/Command.java