third commit from clean_up branch.
master file changes
clean_up file changes
Commit on Dec 2nd
Merge branch 'dry_up'

Conflicts:
	test1.txt
commit test1 file from dry up branch merge to head
neatup branch file
neat up branch files
Merge branch 'neat_up'
master commit
Test file to delete - Checkin