working on update and altered logic test to test for update alone
Merge branch 'master' of https://github.com/cs2103aug2014-w09-1j/main

Conflicts:
	src/mytasks/logic/LogicTest.java
successful implementation of undoing delete command with testing
resolving con flit with logic test