resolve merge conflict
some css
still working on css
Merge branch 'testingviews'
Styled views
resolve merge conflict
resolve conflict