don't know why the one i commited yesterday wasn't the updated one
Merge branch 'master' of https://github.com/cs2103aug2014-t11-3j/main into Ben's_branch
changed the some of the task functions in the mytablemodel, however not sure which timing to get for the date/time column of the todolisttable so left that as it is. and i commented out a method in the time being
Merge branch 'linh-dev' into Ben's_branch

Conflicts:
	src/todologApp/ToDoListTableModel.java
	src/todologApp/UserInterface.java
changed size of todolisttable
changed size of the gui. made it bigger
Merge remote-tracking branch 'origin/vani's_branch' into Ben's_branch

Conflicts:
	src/todologApp/CommandEdit.java
	src/todologApp/Controller.java
	src/todologApp/FileStorage.java
	src/todologApp/History.java
	src/todologApp/Task.java
	src/todologApp/ToDoListTableModel.java
	src/todologApp/UserInterface.java
nothing
Merge commit '7efb62383b7512b0036d1873216203c21682cfa2' into Ben's_branch

Conflicts:
	.classpath
	src/todologApp/Task.java
	src/todologApp/TaskTest.java
put in the methods for the get venue and get person
adding image
changed classpath
added break
added to build path
removed useless code
added a button but commented it out, but still needs some resizing.
changed font color of legend
Merge remote-tracking branch 'origin/vani's_branch' into Ben's_branch

Conflicts:
	.classpath
	src/todologApp/Controller.java
	src/todologApp/FileStorage.java
	src/todologApp/History.java
	src/todologApp/TaskTest.java
	src/todologApp/ToDoListTableModel.java
	src/todologApp/UserInterface.java
Merge branch 'vani's_branch' of https://github.com/cs2103aug2014-t11-3j/main into Stanley's_Branch
Merge branch 'Ben's_branch' of https://github.com/cs2103aug2014-t11-3j/main into Stanley's_Branch
Merge branch 'linh-dev' of https://github.com/cs2103aug2014-t11-3j/main into Stanley's_Branch

Conflicts:
	src/todologApp/Controller.java