minor changes
resove conflict
resolve conflict
stub methods
more methods
add/remove methods
Merge pull request #24 from Tokanagrammar/db

Add database services