initialize
Merge branch 'master' of https://github.com/boyko-ant/demo-waws-01

Conflicts:
	.gitignore