Adding files
Merge branch 'master' of github.com:alexfish/dashboard

Conflicts:
	.gitignore
	README.md