Jeff: test commit, 10/1, 16:56
Jeff: test commit, 10/1, 17:02
Jeff: test commit, 10/1, 17:09 Git,.app, Windows
Merge remote-tracking branch 'origin/master'

Conflicts:
	nbproject/private/private.properties
	nbproject/private/private.xml