dashing dashboard
Merge branch 'master' of https://github.com/danjohnson3141/dashing

Conflicts:
	.gitignore
	README.md