changed css
added feature 3
Merge branch 'feature1'