Ignore npm-debug.log and DS_Store
Merge branch 'master' of https://github.com/Fuitad/grafana

Conflicts:
	.gitignore