initial commit comment
	merge branch 'master' of https://github.com/CitizenInn/soap

Conflicts:
	.gitignore
Merge branch 'master' of https://github.com/CitizenInn/soap

Conflicts:
	.gitignore
	README.md