Update style and css
Merge conflict
Update Style and javascript
Merge branch 'master' of https://github.com/pocus/mondiale