refactor
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/todo/model/ItemList.java
Merge branch 'master' of https://github.com/cs2103aug2014-t15-2j/todo