Commit before pull
Merge branch 'master' of https://github.com/luzhanov/edu-lss

Conflicts:
	PointImplimentation/.idea/workspace.xml
message1