committing before pull
Merge branch 'master' of https://github.com/cs2103aug2014-w09-1j/main

Conflicts:
	.gitignore
	bin/mytasks/logic/LocalMemory.class
	bin/mytasks/parser/MyTasksParser.class
committing before pull
Merge branch 'master' of https://github.com/cs2103aug2014-w09-1j/main
committing before pull for v0.1
Merge branch 'master' of https://github.com/cs2103aug2014-w09-1j/main