dummy commit
Merge branch 'master' of https://github.com/cs2103aug2014-w11-1j/main

Conflicts:
	TaskManagerProject/src/manager/StateManagerTest.java