add
hi
update to bruceidea branch
update
updated merge

Merge branch 'bruceidea'

Conflicts:
	README.txt