Update circles.cpp
Merge pull request #1 from mercviper/circle_exercise1

Update circles.cpp
Update circles.cpp
Update circles.cpp
Update circles.cpp
Update circles.cpp
Update circles.cpp
Merge pull request #2 from mercviper/circles-ex-2

Update circles.cpp
Merge pull request #4 from mercviper/Circles-ex-4

Circles ex 4
Update square.cpp
Merge pull request #3 from mercviper/circles-ex-3

Circles ex 3
Merge pull request #5 from mercviper/Square-ex-1

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

Conflicts:
	Lab-4a/square.cpp