meow
Merge branch 'master' of github.com:theZiz/2d-functions

Conflicts:
	defines.h
Little change in the help