add style guide
Merge branch 'refs/heads/dev'

Conflicts:
	README.md