datastore update synced the text file
Merge branch 'master' of https://github.com/cs2103aug2014-w15-1j/main

Conflicts:
	.DS_Store
	Taskfile.txt
	Trashfile.txt
	bin/.gitignore