DB and Services
Merge pull request #7 from nikobreyno/master

DB and Services