Revert "po revercie"

This reverts commit 103af9bceb631c34de97b4210d6bca23b64ab157.

Conflicts:

	main.cpp