Merge branch 'curves' of /home/matt/Programming/Java/DrawTree with conflicts.