added a new line of text
added a line of text
adding associations
adding more associations
addition to nested file
REBASE TEST

added a line of text

adding associations

adding more associations
Merge branch 'DEV' of github.com:kenjon/Workbench into DEV
Deceased members of immediate Jones Family
added a new line of text
added a line of text
adding associations
adding more associations
addition to nested file
change to Financials File
Merge remote-tracking branch 'origin/trialBRanch' into DEV

Conflicts:
	Financials/cashFile.txt
Merge branch 'DEV' in to 'master'

Conflicts:
	paulJones.txt