test
Merge branch 'master' of github.com:perrylau/sungrow

Conflicts:
	.gitignore