added db info
Merge branch 'master' into cristi
Styling changes made in class

styled buttons and changed colors around