d
Merge branch 'master' of https://github.com/bcw104/scada-webapp

Conflicts:
	.gitignore