Merge branch 'master' of /Users/Paddy/IdeaProjects/JavaTests with conflicts.
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
ADD: same point detection (line)