rolled back
Merge branch 'master' of https://github.com/heroichornet/dashboard

Conflicts:
	README.md
	atmel studio 6.0 project/Dashboard/Dashboard.atsuo