next
Merge branch 'master' of https://github.com/mifark/graphics1.git

Conflicts:
	graphics2h/algorithms.cpp
	graphics2h/algorithms.h