v
Merge branch 'master' of https://github.com/cs2103aug2014-w15-1j/main

Conflicts:
	src/cli/CliToLogTest_Simple_CMD.java
check
Merge branch 'master' of https://github.com/cs2103aug2014-w15-1j/main
tut7
Merge branch 'master' of https://github.com/cs2103aug2014-w15-1j/main
151014
151014
v
Merge branch 'master' of https://github.com/cs2103aug2014-w15-1j/main

Conflicts:
	bin/.gitignore
	src/parser/CliToLogTest_Simple_CMD.java
monday
Merge branch 'master' of https://github.com/cs2103aug2014-w15-1j/main

Conflicts:
	src/parser/TestSimpleCMD.java
Edit Jdate for DataStore and read_file