Prepare merge
Merge branch 'master' of
https://github.com/cs2103aug2014-f11-1j/TaskCommander.git

Conflicts:
	tasks.json