boing
Merge branch 'master' of https://github.com/Maltebest/Supernasen1

Conflicts:
	R/calculatetriangle.R
Merge branch 'master' of https://github.com/Maltebest/Supernasen1

Conflicts:
	R/calculatetriangle.R