This is the rovingcoder commit msg for 1.2
Git merge message
Merge remote-tracking branch 'origin/streetlineV2' into streetlineV2

Conflicts:
	test_2.java