tidy all style sheets and html
Merge branch 'master' of https://github.com/braunchr/test1.git