sorted out bugs
Merge remote-tracking branch 'origin/master'

Conflicts:
	Project/edu/nus/comp/cs2103t/taskerino/common/Data.java
	Project/edu/nus/comp/cs2103t/taskerino/parser/Parser.java