Merge pull request #4 from TWINMOD/develop

Develop
commit and revert
Revert "commit and revert"

This reverts commit e4d846d0c6b5fbeeaffb609383dca88c9aa237b8.
Merge pull request #25 from cs2103aug2014-t16-3j/develop

Develop
Merge branch 'master' of https://github.com/cs2103aug2014-t16-3j/main.git into develop
changed engine and itemdata abit

Signed-off-by: Nicholas Lum <nicholaslum444@hotmail.com>
Merge branch 'develop' of https://github.com/cs2103aug2014-t16-3j/main.git into develop
added some stuff to recycle bin


Signed-off-by: Nicholas Lum <nicholaslum444@hotmail.com>