new branch
resolve merge conflict
optimized database, created queries for stats
Merge pull request #13 from jpark3000/db_tinkering

Db tinkering