branch add2
Merge branch 'conrad'

merged conrad into master
Update flims.rtf
master
hh
Merge branch 'master' into conrad

Conflicts:
	flims.rtf