Merge pull request #1 from garyjob/master

usage of ORM and inclusion of unit testing
removing comments, updating schema