fixed db bug
Merge pull request #18 from Mikedgs/Mike_refactoring

fixed db bug
Follow button added, merging..
fixed merge conflicts