Update square.cpp
Update square.cpp
Merge branch 'master' into square-ex.2

Conflicts:
	Lab-4a/square.cpp
Merge pull request #6 from mercviper/square-ex.2

Square ex.2