Merge pull request #57 from cs2103aug2014-w15-3J/master

Merge Logic with Master
Repackaged the files.
Edited the individual package info
Edited the package path
Merge pull request #58 from cs2103aug2014-w15-3J/Logic

Merge Master with Logic