merge
Merge commit '51e621fc6d5a1de5e2cf12e91a1144fb058cd890' into Ben's_branch
Merge remote-tracking branch 'origin/linh-dev' into Ben's_branch
worked on bugs
Merge commit 'dd052f04209c3cd00f6b1040de4b251892b4dbeb' into Ben's_branch
Merge commit '5ab2ace27fe54b0f649faafc176fb9aa7205fc42' into Ben's_branch
Merge commit 'e70582a1efbfd60e18657f001781c3c78dd5789e' into Ben's_branch

Conflicts:
	src/todologApp/CommandView.java
	src/todologApp/UserInterface.java
Merge remote-tracking branch 'origin/linh-dev' into Ben's_branch
Merge remote-tracking branch 'origin/linh-dev' into Ben's_branch
fix pageup and pagedown, set application in the center, got rid of words "by" and "with"
draggable UI
Merge remote-tracking branch 'origin/Stanley's_Branch' into Ben's_branch

Conflicts:
	.classpath
Merge remote-tracking branch 'origin/vani's_branch' into Ben's_branch

Conflicts:
	.classpath
	src/todologApp/CommandView.java
Merge remote-tracking branch 'origin/linh-dev' into Ben's_branch

Conflicts:
	.classpath
	src/todologApp/Controller.java
added some changes
classpath
Merge branch 'Ben's_branch' of https://github.com/cs2103aug2014-t11-3j/main into Stanley's_Branch

Conflicts:
	.classpath
	src/todologApp/CommandView.java
	src/todologApp/Controller.java
added class path
refactor CommandView and use ClassLoader for loading resources
Merge Ben's branch