no special changes.
Merge branch 'master' of https://github.com/cs2103aug2014-w09-1j/main

Conflicts:
	src/mytasks/logic/MemorySnapshotHandler.java
Changed test cases in Logic Test to the new syntax. Passed all tests.