dashboard in progress
Merge branch 'glisti'

Conflicts:
	drawing.html
	main.py
Fixed merge problems