css
Merge remote-tracking branch 'origin/master'

Conflicts:
	site/vue.html
vue
Merge branch 'master' of https://github.com/Kevin445/Diagnaliz

Conflicts:
	site/public/css/style.css