merged clean with master
Merge remote-tracking branch 'upstream/master'
adjust line length
update css
Merge remote-tracking branch 'upstream/master'
merged upstream changes