CSS.
Merge branch 'master' of https://github.com/arshsab/K.A.R.E

Conflicts:
	WebServer/web/css/dashboard.css