updated css
Merge branch 'tylernew_branch'
merged master into mine  and prepared for my pull to master