Commit
Merge branch 'master' of https://github.com/cs2103aug2014-f11-3j/main

Conflicts:
	test/taskbuddy/database/DatabaseTest.java
Tested both add and delete functions