some view
Merge branch 'master' of github.com:rogozhnikoff/reactive-elephant

Conflicts:
	.idea/workspace.xml