update to style.css to check merging in git
Merge branch 'master' of https://github.com/taiyode/HistoryWebApp
this is necesary as ther is a conflic