Merge pull request #48 from jonbird81/master

Fixed merge conflict and database calls working