dashboard changed
Merge branch 'master' of https://github.com/sang4441/ece

Conflicts:
	.idea/workspace.xml