Merge branch 'master' into cristi
Merge branch 'master' into cristi
Styling changes made in class

styled buttons and changed colors around
Merge branch 'cristi'
added bootstrap