Mark as author
Merge remote-tracking branch 'origin/master'

Conflicts:
	Project/edu/nus/comp/cs2103t/taskerino/common/Assist.java
	Project/edu/nus/comp/cs2103t/taskerino/common/Command.java
	Project/edu/nus/comp/cs2103t/taskerino/common/Task.java
	Project/edu/nus/comp/cs2103t/taskerino/storage/Storage.java