updates to database pull
resolve conflict
Merge branch 'master' of https://github.com/PhoenixRockit/3rd-degree
pulling results