task 3 of hw done.
Merge branch 'adam'
Merge branch 'master' of https://github.com/tinypang/comp5216

Conflicts:
	ToDoList/bin/ToDoList.apk
	ToDoList/bin/classes.dex
	ToDoList/bin/classes/com/adamschalmers/com/MainActivity$1$1.class
	ToDoList/bin/classes/com/adamschalmers/com/MainActivity$1$2.class
	ToDoList/bin/classes/com/adamschalmers/com/MainActivity$1.class
	ToDoList/bin/classes/com/adamschalmers/com/MainActivity$2.class
	ToDoList/bin/classes/com/adamschalmers/com/MainActivity.class
	ToDoList/bin/classes/com/adamschalmers/com/R$id.class
	ToDoList/bin/classes/com/adamschalmers/com/R$string.class
	ToDoList/bin/resources.ap_