Commit 5 - dashlight
Merge remote-tracking branch 'origin/master'

Conflicts:
	css/s.css
	dash.html
	js/j.js