Merge branch 'fabian'
Merge branch 'fabian'
Merge branch 'master' into fabian
Update SplineArea.java

derp
Merge branch 'master' of https://github.com/zypus/CAD
Merge branch 'master' into fabian

Conflicts:
	src/splines/CubicSpline.java
Final version. Maybe.