commit 1 by Alexey
commit 1 by Alexey
Merge remote-tracking branch 'origin/master'

Conflicts:
	Kofi.iws
	model/model.iml
commit 2 by Alexey