different styles etc
styles
fixed different styles and design
merging style with master
Merge branch 'style'
merging style with master