Edit task complete
Merge branch 'master' of https://github.com/gmansilla/comp303

Conflicts:
	TodoListWeb/src/todo/servlet/TodoServlet.java
Merge branch 'master' of https://github.com/gmansilla/comp303