Merge branch 'master' of https://github.com/waseem24/TheToDoList.git

Conflicts:
	ToDoList/src/com/todolist/controller/MemberController.java
ok
ok