Recommend Site
Merge branch 'master' of github.com:leonson/smartanws

Conflicts:
	.gitignore
Merge branch 'master' of github.com:leonson/smartanws