Initial Commit
Merge https://github.com/gsh199449/ElecWebService

Conflicts:
	.gitignore