triangles
Merge branch 'master' of https://github.com/Grrandi/itpfunc

Conflicts:
	functions1.hs