nullpointer bug for API in Task
Merge branch 'master' of https://github.com/cs2103aug2014-w15-1j/main

Conflicts:
	.DS_Store