Merge pull request #22 from Tzinov15/jkinnard

started database functions; broken for now
Merge pull request #23 from Tzinov15/jkinnard

moved around to reflect new code location.
Merge branch 'master' into jkinnard